summaryrefslogtreecommitdiff
path: root/arch/arm/mach-prima2
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-09-03 15:28:37 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-09-03 15:28:37 +0100
commit40d3f02851577da27b5cbb1538888301245ef1e7 (patch)
tree67b029a2cdab7da9ce91af5f27a3250576832f6f /arch/arm/mach-prima2
parente0aa3a665782e29cec752ae667c51ed4ee75d11f (diff)
parent3939f3345050b1ace675675c47d99fd7b606d9e3 (diff)
parent9205b797dbe519a629267ec8c5766cd973d35063 (diff)
parent3fa609755c11fbe8770ede4d895ebb86fb7b9f1e (diff)
parenta5e090acbf545c0a3b04080f8a488b17ec41fe02 (diff)
Merge branches 'cleanup', 'fixes', 'misc', 'omap-barrier' and 'uaccess' into for-linus