From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Mar 2015 00:08:29 +0000 (-0700)
Subject: Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: v4.0-rc6~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1401b7c3ec5a8521e53a56c0da27f743b4765d26;p=thirdparty%2Flinux.git

Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/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
---

1401b7c3ec5a8521e53a56c0da27f743b4765d26