aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 19:27:40 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 19:27:40 +0100
commitec19628d72cff8f80220b7cedba089074ac6a599 (patch)
treec3ec69d6648fdfd3e19563fa341d6585a3d77567 /arch/arm/include
parentMerge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate (diff)
parentARM: 6852/1: EP93xx: Remove ep93xx_gpio_dbg_show function (diff)
parentARM: 6939/1: fix missing 'cpu_relax()' declaration (diff)
parentARM: 6901/1: remove unneeded check of the cache_is_vipt_nonaliasing() (diff)
parentARM: 6858/1: mmci: force negative edge on clock bypass for ux500 (diff)
parentARM: 6888/1: remove ns9xxx port (diff)
parentARM: 6933/1: SPEAR6xx: Rename spear600_defconfig as spear6xx_defconfig (diff)
downloadlinux-dev-ec19628d72cff8f80220b7cedba089074ac6a599.tar.xz
linux-dev-ec19628d72cff8f80220b7cedba089074ac6a599.zip
Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus