From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 20 Nov 2015 02:02:46 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~234
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d08fd0a98b799f101a8750f0d7ed943bdc391db1;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek:
  pci: Limit VPD length for megaraid_sas adapter
  KABI Padding to allow future extensions
---

d08fd0a98b799f101a8750f0d7ed943bdc391db1