diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-15 16:53:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-15 16:53:33 -0700 |
| commit | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (patch) | |
| tree | a1c286887f60482325a6b18d9ca4373b5e9428bd /include/linux/can.h | |
| parent | b92dea67cc66970cda6b5b11895d08e35b4618e7 (diff) | |
| parent | 0cbccbc30a60ff60dbeb203154f1f527c632de9b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide-generic: don't probe all legacy ISA IDE ports by default
ide-cs: fix releasing I/O resources
ide-cs: fix probing and add warm-plug support
ide-pmac: remove bogus comment about pmac_ide_setup_device()
ide-pmac: add ->cable_detect method
ide-pmac: bugfix for media-bay support rework
opti621: add PIO 4 support
opti621: use pre-calculated PIO timings
opti621: program devices timings separately in ->set_pio_mode
opti621: use PCI clock value provided by controller
opti621: remove DMA support
opti621: disable read prefetch
Diffstat (limited to 'include/linux/can.h')
0 files changed, 0 insertions, 0 deletions