]> 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, 11 Dec 2015 20:21:23 +0000 (12:21 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Dec 2015 20:21:23 +0000 (12:21 -0800)
* 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek:
  scsi: Fix a bdi reregistration race
  i40e: Fix for recursive RTNL lock during PROMISC change

1  2 
drivers/net/ethernet/intel/i40e/i40e_main.c