Linus Torvalds 7cc4e87f91 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits) [ARM] 5300/1: fixup spitz reset during boot [ARM] 5295/1: make ZONE_DMA optional [ARM] 5239/1: Palm Zire 72 power management support [ARM] 5298/1: Drop desc_handle_irq() [ARM] 5297/1: [KS8695] Fix two compile-time warnings [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores. [ARM] pxa: allow multi-machine PCMCIA builds [ARM] pxa: add preliminary CPUFREQ support for PXA3xx [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c [ARM] pxa/zylonite: add support for USB OHCI [ARM] ohci-pxa27x: use ioremap() and offset for register access [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph() [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c [ARM] pxa: simplify DMA register definitions [ARM] pxa: make additional DCSR bits valid for PXA3xx [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c ... Fixed up conflicts in arch/arm/mach-versatile/core.c sound/soc/pxa/pxa2xx-ac97.c sound/soc/pxa/pxa2xx-i2s.c manually.		2008-10-11 10:09:45 -07:00
..
at91_cf.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
au1000_db1x00.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
au1000_generic.c	Alchemy Semi Au1000 pcmcia driver: convert pcmcia_sockets_lock in a mutex	2008-05-01 08:04:00 -07:00
au1000_generic.h	pcmcia: remove unused bulkmem.h	2008-06-24 15:33:43 +02:00
au1000_pb1x00.c	pcmcia: remove unused bulkmem.h	2008-06-24 15:33:43 +02:00
au1000_xxs1500.c	pcmcia: remove unused bulkmem.h	2008-06-24 15:33:43 +02:00
bfin_cf_pcmcia.c	pcmcia: add support CompactFlash PCMCIA support for Blackfin.	2008-06-24 15:33:39 +02:00
cardbus.c	pcmcia: kill IN_CARD_SERVICES	2008-06-24 15:33:43 +02:00
cirrus.h
cistpl.c	pcmcia: fix cisinfo_t removal	2008-07-15 20:53:06 +02:00
cs_internal.h	pcmcia: (re)move {pcmcia,pccard}_get_status	2008-06-24 15:33:44 +02:00
cs.c	pcmcia: kill IN_CARD_SERVICES	2008-06-24 15:33:43 +02:00
ds_internal.h
ds.c	pcmcia: Fix broken abuse of dev->driver_data	2008-09-22 08:42:50 -07:00
electra_cf.c	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	2008-07-24 10:47:21 -07:00
hd64465_ss.c	pcmcia: remove unused bulkmem.h	2008-06-24 15:33:43 +02:00
i82092.c	pcmcia: remove CVS keywords	2008-06-24 15:33:37 +02:00
i82092aa.h	pcmcia: remove CVS keywords	2008-06-24 15:33:37 +02:00
i82365.c	pcmcia: i82365.c: check request_irq return value	2008-06-24 15:33:38 +02:00
i82365.h
Kconfig	Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm	2008-10-07 19:08:32 +01:00
m8xx_pcmcia.c	Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build	2008-07-15 15:44:51 +10:00
m32r_cfc.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
m32r_cfc.h
m32r_pcc.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
m32r_pcc.h
Makefile	[ARM] pxa: allow multi-machine PCMCIA builds	2008-10-07 19:16:33 +01:00
o2micro.h
omap_cf.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
pcmcia_ioctl.c	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2008-07-14 14:48:31 -07:00
pcmcia_resource.c	pcmcia: (re)move {pcmcia,pccard}_get_status	2008-06-24 15:33:44 +02:00
pd6729.c	pcmcia: silence section mismatch warnings from pci_driver variables	2008-05-01 08:04:00 -07:00
pd6729.h
pxa2xx_base.c	Add support for the Arcom/Eurotech Viper SBC CompactFlash card slot	2008-09-09 17:41:53 +02:00
pxa2xx_base.h	[ARM] Fix suspend oops caused by PXA2xx PCMCIA driver	2006-10-28 22:42:56 +01:00
pxa2xx_cm_x2xx.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_cm_x255.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_cm_x270.c	[ARM] 5283/1: pxa: add CM-X255 pcmcia support	2008-10-07 12:08:02 +01:00
pxa2xx_lubbock.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
pxa2xx_mainstone.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
pxa2xx_palmld.c	[ARM] 5199/1: PalmLD: PCMCIA driver	2008-08-16 16:37:06 +01:00
pxa2xx_palmtx.c	[ARM] 5198/1: PalmTX: PCMCIA fixes	2008-08-16 16:35:33 +01:00
pxa2xx_sharpsl.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
pxa2xx_trizeps4.c	[ARM] pxa: trizeps4: remove unused variable	2008-10-07 15:52:03 +01:00
pxa2xx_viper.c	Add support for the Arcom/Eurotech Viper SBC CompactFlash card slot	2008-09-09 17:41:53 +02:00
ricoh.h
rsrc_mgr.c	pcmcia: carve out ioctl adjust function to pcmcia_ioctl	2008-06-24 15:33:42 +02:00
rsrc_nonstatic.c	pcmcia: rsrc_nonstatic: check value, not pointer	2008-07-28 16:37:10 +02:00
sa11xx_base.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa11xx_base.h
sa1100_assabet.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_badge4.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_cerf.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_generic.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sa1100_generic.h
sa1100_h3600.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_jornada720.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_neponset.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_shannon.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1100_simpad.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1111_generic.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
sa1111_generic.h
soc_common.c	[ARM] 5245/1: Fix warning about unused return value in drivers/pcmcia	2008-09-13 20:07:42 +01:00
soc_common.h	pcmcia: remove unused bulkmem.h	2008-06-24 15:33:43 +02:00
socket_sysfs.c	pcmcia: kill IN_CARD_SERVICES	2008-06-24 15:33:43 +02:00
tcic.c	pcmcia: replace kio_addr_t with unsigned int everywhere	2008-02-05 09:44:08 -08:00
tcic.h
ti113x.h	pcmcia: Fix ti12xx_2nd_slot_empty always failing	2008-06-24 15:33:41 +02:00
topic.h
vg468.h
vrc4171_card.c	Driver core: more fallout from class_device changes for pcmcia	2007-02-23 14:52:09 -08:00
vrc4173_cardu.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
vrc4173_cardu.h
yenta_socket.c	pcmcia: fix kernel-doc comments	2007-12-10 19:43:54 -08:00
yenta_socket.h