diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:34:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 20:34:29 -0700 |
commit | b3d9d6be035a7d1cc6740cee695301bf37caedcd (patch) | |
tree | f4244162d7f1f55ebbe53a717a47ef81988976b2 /net/irda/irmod.c | |
parent | b35e7041186a9ace341665d404274d58a32b6e2c (diff) | |
parent | 96af154710d44b574515431a0bb014888398a741 (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/irda/irmod.c')
0 files changed, 0 insertions, 0 deletions