summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 20:34:29 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 20:34:29 -0700
commitb3d9d6be035a7d1cc6740cee695301bf37caedcd (patch)
treef4244162d7f1f55ebbe53a717a47ef81988976b2 /net
parentb35e7041186a9ace341665d404274d58a32b6e2c (diff)
parent96af154710d44b574515431a0bb014888398a741 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_sis: use correct S/G table size pata_cs5536: MWDMA fix sata_sis: fix SCR read breakage libata: fix kernel-doc param name
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions