summaryrefslogtreecommitdiff
path: root/arch/arm/mm/proc-arm946.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-04-14 22:28:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-04-14 22:28:25 +0100
commitc848791f0336914a3081ea3fe029cf177d81de81 (patch)
tree41e6c0003218b5a2075a3f09f781bf345029096e /arch/arm/mm/proc-arm946.S
parent79403cda37204b06b9f96351a35251ff7d88de4b (diff)
parente5b61deb3af465f11db7e5e11944ba00a33ece1f (diff)
parent6c5c2a01fcfdb70f2e95e30e96ccf53b88e81023 (diff)
Merge branches 'misc', 'vdso' and 'fixes' into for-next
Conflicts: arch/arm/mm/proc-macros.S