]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 30 Oct 2015 16:25:14 +0000 (09:25 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 30 Oct 2015 16:25:14 +0000 (09:25 -0700)
* 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek:
  i40e: relax fw api minor version for fortville 4 nvm image


Trivial merge