diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 20:56:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-12 20:56:20 -0800 |
| commit | 2d13c8f0682bd38c74e89a76cc550f0324b610ba (patch) | |
| tree | 8e2286479c18f5ee076d26ee44ff03b44d38a299 /net/lapb/lapb_subr.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | libata: retry link resume if necessary (diff) | |
| download | linux-dev-2d13c8f0682bd38c74e89a76cc550f0324b610ba.tar.xz linux-dev-2d13c8f0682bd38c74e89a76cc550f0324b610ba.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: retry link resume if necessary
ata_piix: enable 32bit PIO on SATA piix
sata_promise: don't classify overruns as HSM errors
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions