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

diff --cc drivers/infiniband/ulp/ipoib/ipoib_cm.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_ib.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_verbs.c
Simple merge

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

diff --cc net/core/skbuff.c
Simple merge