Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
Linus Torvalds [Thu, 29 Mar 2012 23:00:48 +0000 (16:00 -0700)]
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

1  2 
drivers/pcmcia/at91_cf.c
drivers/pcmcia/i82092.c
drivers/pcmcia/m8xx_pcmcia.c
drivers/pcmcia/pd6729.c
drivers/pcmcia/pxa2xx_viper.c
drivers/pcmcia/xxs1500_ss.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge