Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Mar 2015 00:08:29 +0000 (17:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Mar 2015 00:08:29 +0000 (17:08 -0700)
commit1401b7c3ec5a8521e53a56c0da27f743b4765d26
treedc88349fec6b4d10c44b3fa22ed25fa5c0de1e1e
parent5cf955e05c9a1e9a895075af8df89eecc17b6ac8
parent5067c0469c643512f24786990e315f9c15cc7d24
Merge branch 'for-4.0-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fix from Tejun Heo:
 "One patch to fix a regression from the recent switch to blk-mq tag
  allocation which can cause oops on SAS-attached SATA drives"

* 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: Add a new flag to destinguish sas controller