commit a6f707b601c3f85d4b816ea08a757ea1af4f1cc0
author Linus Torvalds <torvalds@linux-foundation.org> Thu Mar 29 16:00:48 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Mar 29 16:00:48 2012 -0700
tree 86cea1675e515c6baca64cea812ebe2ccc6aa955
parent ef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5
parent 80af9e6d7ae633309cc5bca96aee6a45117e7c98

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