Greg Kroah-Hartman 263a5c8e16 Merge 3.3-rc6 into driver-core-next ...

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-03-09 12:35:53 -08:00

..

at91_cf.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

bcm63xx_pcmcia.c

…

bcm63xx_pcmcia.h

…

bfin_cf_pcmcia.c

drivers: Final irq namespace conversion

2011-03-29 14:48:19 +02:00

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

Merge 3.3-rc6 into driver-core-next

2012-03-09 12:35:53 -08:00

electra_cf.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

i82092.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

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

Revert wrong fixes for common misspellings

2011-04-26 23:31:11 -07:00

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 error handling in pxa2xx_drv_pcmcia_probe

2012-02-16 10:41:23 +08: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

Fix common misspellings

2011-03-31 11:26:23 -03:00

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

ARM: scoop: drop pcmcia_init callback

2011-07-11 14:43:32 +08:00

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

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

rsrc_mgr.c

…

rsrc_nonstatic.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02:00

sa11xx_base.c

…

sa11xx_base.h

…

sa1100_assabet.c

…

sa1100_badge4.c

…

sa1100_cerf.c

…

sa1100_generic.c

pcmcia/sa1100: put sa11x0_pcmcia_hw_init[] to .devinit.data

2011-05-06 07:46:11 +02:00

sa1100_generic.h

…

sa1100_h3600.c

…

sa1100_jornada720.c

…

sa1100_nanoengine.c

drivers: Final irq namespace conversion

2011-03-29 14:48:19 +02:00

sa1100_neponset.c

…

sa1100_shannon.c

…

sa1100_simpad.c

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

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

sa1111_generic.c

PCMCIA: fix sa1111 oops on remove

2012-01-24 21:33:26 +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

Fix common misspellings

2011-03-31 11:26:23 -03:00

topic.h

…

vg468.h

…

vrc4171_card.c

…

vrc4173_cardu.c

…

vrc4173_cardu.h

…

xxs1500_ss.c

drivers: Final irq namespace conversion

2011-03-29 14:48:19 +02:00

yenta_socket.c

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

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

yenta_socket.h

…