Russell King 374da9da22 Merge branch 'sa1111' into sa11x0 ...

Conflicts:
	arch/arm/common/sa1111.c
	arch/arm/mach-sa1100/neponset.c

Fixed:
	arch/arm/mach-sa1100/assabet.c
for the neponset changes

2012-03-25 23:54:16 +01:00

..

at91_cf.c

…

bcm63xx_pcmcia.c

…

bcm63xx_pcmcia.h

…

bfin_cf_pcmcia.c

…

cardbus.c

…

cirrus.h

…

cistpl.c

…

cs_internal.h

…

cs.c

…

db1xxx_ss.c

MIPS: Alchemy: Basic support for the DB1300 board.

2011-12-07 22:02:06 +00:00

ds.c

pcmcia: fix socket refcount decrementing on each resume

2012-02-08 19:03:51 -08:00

electra_cf.c

…

i82092.c

…

i82092aa.h

…

i82365.c

…

i82365.h

…

Kconfig

MIPS: Alchemy: Basic support for the DB1300 board.

2011-12-07 22:02:06 +00:00

m8xx_pcmcia.c

…

m32r_cfc.c

…

m32r_cfc.h

…

m32r_pcc.c

…

m32r_pcc.h

…

Makefile

MIPS: Alchemy: remove PB1000 support

2011-12-07 22:02:05 +00:00

o2micro.h

…

omap_cf.c

…

pcmcia_cis.c

…

pcmcia_resource.c

…

pd6729.c

…

pd6729.h

…

pxa2xx_balloon3.c

ARM: pxa: use correct __iomem annotations

2011-10-08 21:03:07 +08:00

pxa2xx_base.c

ARM: PXA: fix lubbock PCMCIA driver build error

2011-11-05 19:09:40 +00:00

pxa2xx_base.h

…

pxa2xx_cm_x2xx.c

ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver

2011-11-05 22:26:46 +00:00

pxa2xx_cm_x255.c

driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()

2011-11-15 19:09:56 +08:00

pxa2xx_cm_x270.c

driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq()

2011-11-15 19:09:56 +08:00

pxa2xx_colibri.c

pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.

2011-07-29 17:55:13 +02:00

pxa2xx_e740.c

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

2011-12-28 10:14:04 +00:00

pxa2xx_lubbock.c

…

pxa2xx_mainstone.c

pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.

2011-07-29 17:55:13 +02:00

pxa2xx_palmld.c

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

2011-12-28 10:14:04 +00:00

pxa2xx_palmtc.c

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

2011-12-28 10:14:04 +00:00

pxa2xx_palmtx.c

pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.

2011-07-29 17:55:13 +02:00

pxa2xx_sharpsl.c

…

pxa2xx_stargate2.c

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

2011-12-28 10:14:04 +00:00

pxa2xx_trizeps4.c

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

2011-12-28 10:14:04 +00:00

pxa2xx_viper.c

pcmcia: pxa2xx: remove empty socket_init / socket_resume functions.

2011-07-29 17:55:13 +02:00

pxa2xx_vpac270.c

pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()

2011-12-28 10:14:04 +00:00

ricoh.h

…

rsrc_iodyn.c

…

rsrc_mgr.c

…

rsrc_nonstatic.c

…

sa11xx_base.c

…

sa11xx_base.h

…

sa1100_assabet.c

…

sa1100_badge4.c

…

sa1100_cerf.c

…

sa1100_generic.c

…

sa1100_generic.h

…

sa1100_h3600.c

…

sa1100_jornada720.c

…

sa1100_nanoengine.c

…

sa1100_neponset.c

ARM: sa11x0: neponset: provide function to manipulate NCR_0

2012-02-09 15:34:14 +00:00

sa1100_shannon.c

…

sa1100_simpad.c

ARM: 7024/1: simpad: Cleanup CS3 accessors.

2011-10-17 09:12:42 +01:00

sa1111_generic.c

ARM: sa1111: move PCMCIA interface register definitions to sa1111_generic.c

2012-03-24 11:30:11 +00:00

sa1111_generic.h

…

soc_common.c

drivers:pcmcia:soc_common: make socket_init and socket_suspend optional

2011-07-29 17:55:10 +02: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

…

xxs1500_ss.c

…

yenta_socket.c

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

yenta_socket.h

…