diff options
| author | Linus Torvalds <[email protected]> | 2011-06-10 03:14:21 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-06-10 03:14:21 +0000 |
| commit | 45694c2895c194ffa74becde4120af6eb6afeefe (patch) | |
| tree | ad81395d2179c44f3ab2a0762a37b409b5536517 /fs/proc/root.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | libata: fix unexpectedly frozen port after ata_eh_reset() (diff) | |
| download | kernel-45694c2895c194ffa74becde4120af6eb6afeefe.tar.gz kernel-45694c2895c194ffa74becde4120af6eb6afeefe.zip | |
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 'fs/proc/root.c')
0 files changed, 0 insertions, 0 deletions