]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6237f11 4d99573)
Merge branch 'topic/uek-4.1/ofed.xsigo' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 7 Oct 2015 11:40:32 +0000 (04:40 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 7 Oct 2015 11:40:32 +0000 (04:40 -0700)
* topic/uek-4.1/ofed.xsigo:
  Add Oracle virtual Networking Drivers for uek4 kernel

1  2 
drivers/infiniband/Kconfig patch | diff1 | diff2 | blob | history
drivers/infiniband/ulp/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/infiniband/Kconfig
Simple merge
diff --cc drivers/infiniband/ulp/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.