diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 18:48:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 18:48:03 -0800 |
| commit | 224b148ef7c9a00642eb33dbdf62f2840bde974f (patch) | |
| tree | 1236762b06beb3565671adc5d554ae2651cd661f /drivers/ide/legacy | |
| parent | 547679087bc60277d11b11631d826895762c4505 (diff) | |
| parent | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394:
ohci1394: cleanup the "Unexpected PCI resource length" warning.
sbp2: misc debug logging cleanups
sbp2: proper treatment of DID_OK
ieee1394: set read permission for parameter disable_irm
sbp2: check for ARM failure
ohci1394: clean up asynchronous and physical request filters programming
ieee1394: remove amdtp remains from ieee1394_core.h
ieee1394: remove devfs support
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
sbp2: prevent unloading of 1394 low-level driver
Diffstat (limited to 'drivers/ide/legacy')
0 files changed, 0 insertions, 0 deletions