diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-10 07:14:21 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-10 07:14:21 +0400 |
commit | 45694c2895c194ffa74becde4120af6eb6afeefe (patch) | |
tree | ad81395d2179c44f3ab2a0762a37b409b5536517 /include/linux | |
parent | 7f45e5cd1718ed769295033ca214032848a0097d (diff) | |
parent | 8c56cacc724c7650b893d43068fa66044aa29a61 (diff) | |
download | linux-45694c2895c194ffa74becde4120af6eb6afeefe.tar.xz |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: fix unexpectedly frozen port after ata_eh_reset()
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions