diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:19:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 11:19:47 -0700 |
commit | 6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e (patch) | |
tree | 556f9fa6e4b34082f3fbf54dfbd249b29967be28 /arch/m68k/kernel/traps.c | |
parent | 60ca97584fcb98d2f1b14e4c2f12203dd5b3888e (diff) | |
parent | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (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:
[PATCH] pata-qdi: fix le32 in data_xfer
[libata] sata_promise: add PCI ID
[PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl
[PATCH] libata: Don't believe bogus claims in the older PIO mode register
Diffstat (limited to 'arch/m68k/kernel/traps.c')
0 files changed, 0 insertions, 0 deletions