From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 11 Dec 2015 20:21:23 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into... 
X-Git-Tag: v4.1.12-92~216
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=57a9de43c71fa8731a91349ceead5dc06441a337;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/drivers' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* '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
---

57a9de43c71fa8731a91349ceead5dc06441a337