Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2016 02:46:59 +0000 (11:46 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2016 02:46:59 +0000 (11:46 +0900)
Pull libata fix from Tejun Heo:
 "Another fallout from max_sectors bump a couple years ago.  The lite-on
  optical drive times out on large requests"

* 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libata: LITE-ON CX1-JB256-HP needs lower max_sectors


Trivial merge