diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-11 23:36:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-11 23:36:46 -0700 |
commit | af94bdfa798b7da92cc82609acca61a287a004a4 (patch) | |
tree | 194ff974eb83f44371d5d51f95b1314ae03476e4 /kernel/cgroup | |
parent | fe251c4b9a272af45983ebc7dd538789e78fcf2e (diff) | |
parent | 3cf864520e877505158f09075794a08abab11bbe (diff) | |
download | linux-af94bdfa798b7da92cc82609acca61a287a004a4.tar.gz linux-af94bdfa798b7da92cc82609acca61a287a004a4.tar.bz2 linux-af94bdfa798b7da92cc82609acca61a287a004a4.zip |
Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Two libata fixes.
One to disable hotplug on VT6420 which never worked properly. The
other reverts an earlier patch which disabled the second port on
SB600/700. There were some confusions due to earlier datasheets which
incorrectly indicated that the second port is not implemented on both
SB600 and 700"
* 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
sata_via: Enable hotplug only on VT6421
Revert "pata_atiixp: Don't use unconnected secondary port on SB600/SB700"
Diffstat (limited to 'kernel/cgroup')
0 files changed, 0 insertions, 0 deletions