From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Mar 2012 23:00:48 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a6f707b601c3f85d4b816ea08a757ea1af4f1cc0;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./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
---

a6f707b601c3f85d4b816ea08a757ea1af4f1cc0