summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/lubbock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-27 08:32:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-27 08:32:37 +0200
commitb96d71571f7745216ef63f13770b5a10b94ddd34 (patch)
tree77369180dfdbde029104e26210fdbf13fc4db3e7 /arch/arm/mach-pxa/lubbock.c
parentMerge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentpata_efar: fix register naming used in efar_set_piomode() (diff)
downloadlinux-b96d71571f7745216ef63f13770b5a10b94ddd34.tar.xz
linux-b96d71571f7745216ef63f13770b5a10b94ddd34.zip
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev: (50 commits) pata_efar: fix register naming used in efar_set_piomode() pata_rdc: add Power Management support ata_piix: unify code for programming PIO and MWDMA timings ata_piix: SITRE handling fix libata: make ata_sff_data_xfer_noirq() work with 32-bit PIO pata_artop: add Power Management support pata_sl82c105: add Power Management support pata_pdc2027x: add Power Management support pata_legacy: use PIO mask defines pata_legacy: unify QDI ->set_piomode methods libata: remove no longer needed pata_qdi driver pata_it8213: fix register naming used in it8213_set_piomode() pata_it8213: add UDMA100 and UDMA133 support pata_rdc: parallel scanning needs an extra locking pata_via: add via_fixup() libata: ata_timing_compute() fixup pata_scc: add proper cable detection method pata_arasan_cf: remove bogus to_platform_device() calls pata_atiixp: add proper ->prereset method pata_serverworks: add serverworks_fixup() ...
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
0 files changed, 0 insertions, 0 deletions