From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2016 01:00:39 +0000 (-0700)
Subject: Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
X-Git-Tag: v4.7-rc1~148
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01;p=linux-2.6-block.git

Merge branch 'for-4.7' of git://git./linux/kernel/git/tj/libata

Pull libata updates from Tejun Heo:
 "Trivial changes except for special case timeout bumping.

  I have two more libata branches which depend on SCSI and dmaengine
  tree respectively.  I'll send pull requests for them once the
  prerequisite trees are pulled in"

* 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata-scsi: use %*ph to dump small buffers
  treewide: Fix typos in libata.xml
  libata-core: Allow longer timeout for drive spinup from PUIS
  libata: Fixup awkward whitespace in warning by removing line continuation.
---

0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01