diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 17:24:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 17:24:06 +0100 |
| commit | 4c10c937cc2eb197db565392db91d429eec71176 (patch) | |
| tree | 02d7f15b314441e832f48f0f882882042361396c /drivers/pcmcia/pxa2xx_base.h | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy... (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/id... (diff) | |
| download | linux-4c10c937cc2eb197db565392db91d429eec71176.tar.xz linux-4c10c937cc2eb197db565392db91d429eec71176.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits)
drivers/ide: Fix continuation line formats
ide: fixed section mismatch warning in cmd640.c
ide: ide_timing_compute() fixup
ide: make ide_get_best_pio_mode() static
via82cxxx: use ->pio_mode value to determine pair device speed
tx493xide: use ->pio_mode value to determine pair device speed
siimage: use ->pio_mode value to determine pair device speed
palm_bk3710: use ->pio_mode value to determine pair device speed
it821x: use ->pio_mode value to determine pair device speed
cs5536: use ->pio_mode value to determine pair device speed
cs5535: use ->pio_mode value to determine pair device speed
cmd64x: fix handling of address setup timings
amd74xx: use ->pio_mode value to determine pair device speed
alim15x3: fix handling of UDMA enable bit
alim15x3: fix handling of DMA timings
alim15x3: fix handling of command timings
alim15x3: fix handling of address setup timings
ide-timings: use ->pio_mode value to determine fastest PIO speed
ide: change ->set_dma_mode method parameters
ide: change ->set_pio_mode method parameters
...
Diffstat (limited to 'drivers/pcmcia/pxa2xx_base.h')
0 files changed, 0 insertions, 0 deletions