summaryrefslogtreecommitdiffstats
path: root/arch
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
parent3e0a07f8c401bb43e0f964c5f1285b2cb2028645 (diff)
parent6c93dd438aad39c60630dbe47fde8193c845f8b8 (diff)
parent1b21376a737aeaa82320ae014b8e1c2c53cfc479 (diff)
parent0125962000777cd1e2ce53deefb99779d5ee5199 (diff)
downloadlinux-cbd379b10019617457bda31eb243890f4377fa3e.tar.bz2
Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next