Russell King ed40d0c472 Merge branch 'origin' into devel ...

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

2009-03-28 20:29:51 +00:00

..

at91_cf.c

drivers/pcmcia: use nr_irqs

2008-10-16 16:52:06 +02:00

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

…

au1000_xxs1500.c

…

bfin_cf_pcmcia.c

pcmcia: blackfin: fix bug - add missing ; to MODULE macro

2008-12-15 16:27:06 -08:00

cardbus.c

…

cirrus.h

…

cistpl.c

pcmcia: add braces in error path

2008-11-02 19:55:45 +01:00

cs_internal.h

…

cs.c

pcmcia: ensure correct logging in do_io_probe

2008-11-09 21:47:47 +01:00

ds.c

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

2008-11-02 15:05:51 +01:00

electra_cf.c

powerpc: Change u64/s64 to a long long integer type

2009-01-13 14:47:59 +11:00

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

[PCMCIA] e740 PCMCIA socket driver.

2008-12-15 03:52:53 +00: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

[PCMCIA] e740 PCMCIA socket driver.

2008-12-15 03:52:53 +00:00

o2micro.h

…

omap_cf.c

…

pcmcia_ioctl.c

…

pcmcia_resource.c

pcmcia: fix indentation & braces disagreement - add braces

2008-11-01 23:39:11 +01:00

pd6729.c

…

pd6729.h

…

pxa2xx_base.c

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

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

pxa2xx_base.h

…

pxa2xx_cm_x2xx.c

…

pxa2xx_cm_x255.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

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

pxa2xx_cm_x270.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

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

pxa2xx_e740.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

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

pxa2xx_lubbock.c

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

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

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_palmtx.c

…

pxa2xx_sharpsl.c

…

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

[ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h

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

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

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

2008-11-02 15:05:51 +01:00

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

…

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

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

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

tcic.h

…

ti113x.h

…

topic.h

…

vg468.h

…

vrc4171_card.c

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

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

vrc4173_cardu.c

…

vrc4173_cardu.h

…

yenta_socket.c

…

yenta_socket.h

…