From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 13 Nov 2015 19:29:08 +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~238
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa801bcda8485640322f5ac7f66218c73305c283;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:
  KABI PADDING FOR ORACLE SPECIFIC FUTURE EXTENSIONS
  Disable VLAN 0 tagging for none VLAN traffic
---

aa801bcda8485640322f5ac7f66218c73305c283