From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2016 02:46:59 +0000 (+0900)
Subject: Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a933f80d948e85aa2ac2724a6167d509339fc6b9;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-4.7-fixes' of git://git./linux/kernel/git/tj/libata

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
---

a933f80d948e85aa2ac2724a6167d509339fc6b9