]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 10 Nov 2015 02:17:26 +0000 (18:17 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 10 Nov 2015 02:17:26 +0000 (18:17 -0800)

Trivial merge