aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-29 11:43:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-29 11:43:28 +0100
commitcbd379b10019617457bda31eb243890f4377fa3e (patch)
treef6ba7bb0f7bbe33a4944c6dadec1bab1a9769572 /arch/arm/include/asm
parentARM: 7773/1: PJ4B: Add support for errata 4742 (diff)
parentARM: 7741/1: mcpm_platsmp.c: remove empty smp_init_cpus method (diff)
parentARM: 7777/1: Avoid extra calls to the C compiler (diff)
parentARM: 7726/1: mmc: mmci: Add card_busy function to improve UHS card support (diff)
downloadlinux-dev-cbd379b10019617457bda31eb243890f4377fa3e.tar.xz
linux-dev-cbd379b10019617457bda31eb243890f4377fa3e.zip
Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next