summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-05-19 10:31:35 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2016-05-19 10:31:35 +0100
commit5632a9fbcd451892332d45553ce8b831d5143691 (patch)
treed02ff0e4b7045449e8c6cb1c0af7233bd39bff8f /arch
parenta41980f2a3eb33ed7a2636e83498b47e95ceb05b (diff)
parente31db4c756879bcd653ff4f36ee3f179c5e333bf (diff)
parent07a7056ccce3ffdb65908bf502aeb2503714da46 (diff)
parent6427a840ff6aeaac36c59872b0b4b2040ed26c9b (diff)
downloadlinux-5632a9fbcd451892332d45553ce8b831d5143691.tar.bz2
Merge branches 'amba', 'devel-stable', 'kexec-for-next' and 'misc' into for-linus