aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-11 09:21:28 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-11 09:21:28 -0800
commit5da38d32824eb27c325d296bf3a39b5946578789 (patch)
treefdc0356ea0de6100a2a180fb93db98f752a543a1 /net
parent7e2cec8631b76e123787a57eb8334b95762b8741 (diff)
parent19b723218bde79c60a394a3caee9eb156ac2d356 (diff)
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 last_reset timestamp handling libata: Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127 [libata] pata_pcmcia: another memory card support [libata] pata_sch: notice attached slave devices [libata] pata_cs553*.c: cleanup kernel-doc
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions