]> 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 into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:39:11 +0000 (11:39 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 16 Jul 2015 18:39:11 +0000 (11:39 -0700)

Trivial merge