projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b92e09b 9f56eca)
Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 23:30:50 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 23:30:50 +0000 (15:30 -0800)
commit7b882cb800095f216c9da6b6735d10d26df8168b
tree4c240a0ecdce63f4c48da2da7e5538facdbd86a5tree | snapshot
parentb92e09bb5bf4db65aeb8ca0094fdd5142ed54451commit | diff
parent9f56eca3aeeab699a7dbfb397661d2eca4430e94commit | diff
Merge branch 'for-4.10' of git://git./linux/kernel/git/tj/libata

Pull another libata patch from Tejun Heo:
 "One more patch from Adam added.

  It makes libata skip probing for NCQ prio unless the feature is
  explicitly requested by the user. This is necessary because some
  controllers lock up after the optional feature is probed"

* 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: avoid probing NCQ Prio Support if not explicitly requested
drivers/ata/libata-core.c diff1 | diff2 | blob | history
drivers/ata/libata-scsi.c diff1 | diff2 | blob | history
John Crispins staging tree