summaryrefslogtreecommitdiff
path: root/arch/arm/mm/vmregion.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 03:00:48 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 03:00:48 +0400
commita6f707b601c3f85d4b816ea08a757ea1af4f1cc0 (patch)
tree86cea1675e515c6baca64cea812ebe2ccc6aa955 /arch/arm/mm/vmregion.h
parentef08e78268423fc4d7fbc3e54bd9a67fc8da7cc5 (diff)
parent80af9e6d7ae633309cc5bca96aee6a45117e7c98 (diff)
downloadlinux-a6f707b601c3f85d4b816ea08a757ea1af4f1cc0.tar.xz
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
Diffstat (limited to 'arch/arm/mm/vmregion.h')
0 files changed, 0 insertions, 0 deletions