diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 18:00:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 18:00:39 -0700 |
| commit | 0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01 (patch) | |
| tree | d916d8513e6f7ea866c2acf3b5a8f368e015bf6d /fs/cifs | |
| parent | 6f88b5be84985f751746d313b8d2a4e18494a602 (diff) | |
| parent | f8d1a93930a754c4ea27238ae1c0fb2356d12e9a (diff) | |
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.
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions