]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 28 Aug 2015 17:56:53 +0000 (10:56 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 28 Aug 2015 17:56:53 +0000 (10:56 -0700)
* 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek:
  uek-rpm: configs: Enable Chelsio T4 and T5 NIC on OL6


Trivial merge