]> 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>
Wed, 26 Aug 2015 19:10:26 +0000 (12:10 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Wed, 26 Aug 2015 19:10:26 +0000 (12:10 -0700)
* 'topic/uek-4.1/rpm-build' of git://ca-git.us.oracle.com/linux-uek:
  uek-rpm: configs: sync up config with v4.1.6 stable tag
  uek-rpm: build: Update the base release to 6 with stable v4.1.6
  uek-rpm: configs: enable SNIC driver in kernel configs


Trivial merge