Russell King baea7b946f Merge branch 'origin' into for-linus ...

Conflicts:
	MAINTAINERS

2009-09-24 21:22:33 +01:00

..

at91_cf.c

…

au1000_db1x00.c

…

au1000_generic.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

au1000_generic.h

…

au1000_pb1x00.c

pcmcia: drop non-existant includes

2009-09-15 10:17:16 -07:00

au1000_xxs1500.c

pcmcia: drop non-existant includes

2009-09-15 10:17:16 -07:00

bfin_cf_pcmcia.c

…

cardbus.c

…

cirrus.h

…

cistpl.c

…

cs_internal.h

…

cs.c

…

ds.c

pcmcia: fix incorrect argument order to list_add_tail()

2009-09-15 10:17:16 -07:00

electra_cf.c

…

i82092.c

…

i82092aa.h

…

i82365.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

i82365.h

…

Kconfig

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05 10:46:32 +08:00

m8xx_pcmcia.c

…

m32r_cfc.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

m32r_cfc.h

…

m32r_pcc.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

m32r_pcc.h

…

Makefile

[ARM] pxa: Palm Tungsten|C PCMCIA support

2009-09-10 18:49:36 +08:00

o2micro.h

pcmcia: disable prefetch/burst for OZ6933

2009-09-15 10:17:16 -07:00

omap_cf.c

…

pcmcia_ioctl.c

pcmcia: switch /proc/bus/pccard/drivers to seq_file

2009-09-22 07:17:42 -07:00

pcmcia_resource.c

pcmcia: document return value of pcmcia_loop_config

2009-09-15 10:17:16 -07:00

pd6729.c

…

pd6729.h

…

pxa2xx_base.c

[ARM] pxa: update pcmcia/pxa2xx_base.c to use 'struct dev_pm_ops'

2009-09-10 19:15:38 +08:00

pxa2xx_base.h

…

pxa2xx_cm_x2xx.c

…

pxa2xx_cm_x255.c

[ARM] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driver

2009-04-02 11:02:32 +01:00

pxa2xx_cm_x270.c

…

pxa2xx_e740.c

…

pxa2xx_lubbock.c

…

pxa2xx_mainstone.c

[ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h

2009-03-09 21:22:40 +08:00

pxa2xx_palmld.c

[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0

2009-03-28 19:24:39 +08:00

pxa2xx_palmtc.c

[ARM] pxa/palm: fix possibly uninitialized variable in PalmTC-pcmcia

2009-09-10 18:49:36 +08:00

pxa2xx_palmtx.c

…

pxa2xx_sharpsl.c

[ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config

2009-04-23 23:25:40 +01:00

pxa2xx_stargate2.c

[ARM] pxa/stargate2: add support for Compact Flash/PCMCIA

2009-06-05 10:46:32 +08:00

pxa2xx_trizeps4.c

[ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h

2009-03-09 21:22:40 +08:00

pxa2xx_viper.c

…

ricoh.h

…

rsrc_mgr.c

pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()

2009-03-24 16:38:22 -07:00

rsrc_nonstatic.c

…

sa11xx_base.c

[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

2009-03-25 10:21:35 +00:00

sa11xx_base.h

…

sa1100_assabet.c

…

sa1100_badge4.c

…

sa1100_cerf.c

…

sa1100_generic.c

platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver'

2009-03-24 16:38:25 -07:00

sa1100_generic.h

…

sa1100_h3600.c

[ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpers

2009-03-15 20:08:18 +00:00

sa1100_jornada720.c

pcmcia: cleanup/fixup patch for sa1100_jornada_pcmcia driver

2009-09-22 07:17:42 -07:00

sa1100_neponset.c

…

sa1100_shannon.c

…

sa1100_simpad.c

…

sa1111_generic.c

[ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h

2009-03-25 10:21:35 +00:00

sa1111_generic.h

…

soc_common.c

[ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c

2009-03-09 21:22:39 +08:00

soc_common.h

[ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c

2009-03-09 21:22:39 +08:00

socket_sysfs.c

…

tcic.c

Remove multiple KERN_ prefixes from printk formats

2009-07-08 10:30:03 -07:00

tcic.h

…

ti113x.h

…

topic.h

…

vg468.h

…

vrc4171_card.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

vrc4173_cardu.c

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

vrc4173_cardu.h

Update Yoichi Yuasa's e-mail address

2009-07-03 15:45:29 +01:00

yenta_socket.c

pcmcia: yenta: add missing __devexit marking

2009-09-22 07:17:42 -07:00

yenta_socket.h

…