projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef08e78 80af9e6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Mar 2012 23:00:48 +0000 (16:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Mar 2012 23:00:48 +0000 (16:00 -0700)
commita6f707b601c3f85d4b816ea08a757ea1af4f1cc0
tree86cea1675e515c6baca64cea812ebe2ccc6aa955tree | snapshot
parentef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5commit | diff
parent80af9e6d7ae633309cc5bca96aee6a45117e7c98commit | diff
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
drivers/pcmcia/at91_cf.c diff1 | diff2 | blob | history
drivers/pcmcia/i82092.c diff1 | diff2 | blob | history
drivers/pcmcia/m8xx_pcmcia.c diff1 | diff2 | blob | history
drivers/pcmcia/pd6729.c diff1 | diff2 | blob | history
drivers/pcmcia/pxa2xx_viper.c diff1 | diff2 | blob | history
drivers/pcmcia/xxs1500_ss.c diff1 | diff2 | blob | history
Domain: System / Kernel;