projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a22e48c 2cfce3a)
Merge branch 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jun 2018 23:59:33 +0000 (16:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Jun 2018 23:59:33 +0000 (16:59 -0700)
commit476d9ff653b3b2d7f3140c56da771f2b4a3d1c0a
tree183241cbd9d52fc46115e2c6c6f88c19fcb105ectree | snapshot
parenta22e48cf317d22a4326dc19e906e6b5f4f92e94ecommit | diff
parent2cfce3a86b64b53f0a70e92a6a659c720c319b45commit | diff
Merge branch 'for-4.17-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "These two are fixes which missed v4.17.

  One is to remove an incorrect power management blacklist entry and the
  other to fix a cdb buffer overrun which has been there for a very long
  time"

* 'for-4.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: Drop SanDisk SD7UB3Q*G1001 NOLPM quirk
  libata: zpodd: small read overflow in eject_tray()
John Crispins staging tree