summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/sa1100_generic.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 19:08:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-05 19:08:10 +0100
commit31edf274f9aff1ccd39934a0b2fce38f4405c656 (patch)
treefdc7bc445307ccb9648ca1a71375947c8ed59722 /drivers/pcmcia/sa1100_generic.c
parentLinux 2.6.37 (diff)
parentARM: 6511/1: ftrace: add ARM support for C version of recordmcount (diff)
parentARM: GIC: move enablement of PPI interrupts to gic.c (diff)
parentARM: io: simplify ioremap* and iounmap definitions (diff)
parentARM: 6522/1: kexec: Add call to non-crashing cores through IPI (diff)
parentARM: module: ignore unwind for sections not marked SHF_ALLOC (diff)
parentARM: 6607/1: sa1100: Update platform device registration (diff)
parentARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM (diff)
parentARM: 6432/1: move timer-sp.c from versatile to common (diff)
downloadlinux-31edf274f9aff1ccd39934a0b2fce38f4405c656.tar.xz
linux-31edf274f9aff1ccd39934a0b2fce38f4405c656.zip
Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel