Merge branches 'misc' and 'misc-rc6' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Jan 2016 11:07:28 +0000 (11:07 +0000)
commit598bcc6ea6ec4032d2ace8b1b43d11b4708af072
tree675a2b01617549b539a4dcb1aec7141798e1f324
parent0bed4b7aa02c06e05121875dc443295d55b9d91d
parente679660dbb8347f275fe5d83a5dd59c1fb6c8e63
Merge branches 'misc' and 'misc-rc6' into for-linus
Documentation/devicetree/bindings/arm/l2c2x0.txt
arch/arm/Kconfig
arch/arm/mm/proc-v7.S
arch/arm64/Kconfig