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

* '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

diff --cc drivers/net/ethernet/cisco/enic/enic_main.c
Simple merge

diff --cc include/linux/blk_types.h
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/mm_types.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/sock.h
Simple merge