Linus Torvalds a6f707b601 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia ... Pull a few PCMCIA updates from Dominik Brodowski. Fix up trivial conflict (modified code in question had been removed) in drivers/pcmcia/soc_common.c. * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia: pcmcia at91_cf: fix raw gpio number usage ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE pcmcia: convert drivers/pcmcia/* to use module_platform_driver() pcmcia: irq: Remove IRQF_DISABLED		2012-03-29 16:00:48 -07:00
..
at91_cf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
bcm63xx_pcmcia.c	pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE	2012-03-03 14:43:37 +01:00
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c	pcmcia: convert drivers/pcmcia/* to use module_platform_driver()	2012-03-03 14:43:37 +01:00
cardbus.c
cirrus.h
cistpl.c
cs_internal.h
cs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
db1xxx_ss.c	pcmcia: convert drivers/pcmcia/* to use module_platform_driver()	2012-03-03 14:43:37 +01:00
ds.c	Merge 3.3-rc6 into driver-core-next	2012-03-09 12:35:53 -08:00
electra_cf.c	pcmcia: convert drivers/pcmcia/* to use module_platform_driver()	2012-03-03 14:43:37 +01:00
i82092.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
i82092aa.h
i82365.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
i82365.h
Kconfig
m8xx_pcmcia.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
m32r_cfc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
m32r_cfc.h
m32r_pcc.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
m32r_pcc.h
Makefile
o2micro.h
omap_cf.c
pcmcia_cis.c
pcmcia_resource.c
pd6729.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
pd6729.h
pxa2xx_balloon3.c
pxa2xx_base.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c
pxa2xx_cm_x270.c
pxa2xx_colibri.c
pxa2xx_e740.c
pxa2xx_mainstone.c
pxa2xx_palmld.c
pxa2xx_palmtc.c
pxa2xx_palmtx.c
pxa2xx_sharpsl.c
pxa2xx_stargate2.c
pxa2xx_trizeps4.c
pxa2xx_viper.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
pxa2xx_vpac270.c
ricoh.h
rsrc_iodyn.c
rsrc_mgr.c
rsrc_nonstatic.c
sa11xx_base.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
sa11xx_base.h
sa1100_assabet.c
sa1100_cerf.c
sa1100_generic.c
sa1100_generic.h
sa1100_h3600.c
sa1100_nanoengine.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_badge4.c
sa1111_generic.c	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
sa1111_generic.h
sa1111_jornada720.c
sa1111_lubbock.c
sa1111_neponset.c	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
soc_common.c	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
soc_common.h
socket_sysfs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
tcic.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c	pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE	2012-03-03 14:43:37 +01:00
vrc4173_cardu.h
xxs1500_ss.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia	2012-03-29 16:00:48 -07:00
yenta_socket.c	pcmcia: Convert to DEFINE_PCI_DEVICE_TABLE	2012-03-03 14:43:37 +01:00
yenta_socket.h