]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 01:00:39 +0000 (18:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 01:00:39 +0000 (18:00 -0700)
commit0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01
treed916d8513e6f7ea866c2acf3b5a8f368e015bf6d
parent6f88b5be84985f751746d313b8d2a4e18494a602
parentf8d1a93930a754c4ea27238ae1c0fb2356d12e9a
Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/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.