summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 23:26:28 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-30 23:26:28 +0100
commit36bc45e219f48b5ec45c5aa34bc13dbe80e10c10 (patch)
treefa1ed8f19232dd08521146efaad44f254b4703f4 /arch/arm/mach-imx
parentLinux 3.1-rc9 (diff)
parentARM: io: remove IO_SPACE_LIMIT from SA11x0 (diff)
parentARM: 7114/1: cache-l2x0: add resume entry for l2 in secure mode (diff)
parentARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff)
downloadlinux-36bc45e219f48b5ec45c5aa34bc13dbe80e10c10.tar.xz
linux-36bc45e219f48b5ec45c5aa34bc13dbe80e10c10.zip
Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' into highbank/soc