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 optimization

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

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

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

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

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