Russell King 53ffe3b440 [ARM] Merge most of the PXA work for initial merge ... This includes PXA work up to the SPI changes for the initial merge, since e172274ccc depends on the SPI tree being merged. Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig		2008-07-14 23:34:46 +01:00
..
at91_cf.c
au1000_db1x00.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
au1000_generic.c
au1000_generic.h
au1000_pb1x00.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
au1000_xxs1500.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
cardbus.c
cirrus.h
cistpl.c
cs_internal.h
cs.c
ds_internal.h
ds.c
electra_cf.c	electra_cf: Add MODULE_DEVICE_TABLE()	2008-05-27 16:07:45 -05:00
hd64465_ss.c
i82092.c
i82092aa.h
i82365.c
i82365.h
Kconfig
m8xx_pcmcia.c
m32r_cfc.c
m32r_cfc.h
m32r_pcc.c
m32r_pcc.h
Makefile
o2micro.h
omap_cf.c	ARM: OMAP: Change omap_cf.c and omap_nor.c to use omap_readw/writew instead of __REG	2008-07-03 12:24:41 +03:00
pcmcia_ioctl.c
pcmcia_resource.c
pd6729.c
pd6729.h
pxa2xx_base.c
pxa2xx_base.h
pxa2xx_cm_x270.c	[ARM] pxa: avoid kfreeing static data if platform device fails to register	2008-06-02 13:49:16 +01:00
pxa2xx_lubbock.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
pxa2xx_mainstone.c	[ARM] pxa: avoid kfreeing static data if platform device fails to register	2008-06-02 13:49:16 +01:00
pxa2xx_sharpsl.c	[ARM] pxa: avoid kfreeing static data if platform device fails to register	2008-06-02 13:49:16 +01:00
ricoh.h
rsrc_mgr.c
rsrc_nonstatic.c
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1100_badge4.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1100_cerf.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1100_generic.c
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1100_neponset.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1100_shannon.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1100_simpad.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
sa1111_generic.c
sa1111_generic.h
soc_common.c	pcmcia: replace remaining __FUNCTION__ occurrences	2008-05-01 08:04:00 -07:00
soc_common.h
socket_sysfs.c
tcic.c
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
yenta_socket.c
yenta_socket.h