Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@armlinux.org.uk>
Wed, 8 Nov 2017 19:42:47 +0000 (19:42 +0000)
committerRussell King <rmk+kernel@armlinux.org.uk>
Wed, 8 Nov 2017 19:42:47 +0000 (19:42 +0000)
commit02196144a0a0ad71fb75bd4a5a4785ab36c3b78e
treeb87fe75626250a456604a331faf3594b4f3925a8
parent7f3d1f984336377074ebf804ff53869ef1906fbe
parentfe9c0589eeef4b3edbaad9f7500679a2eeafe951
Merge branch 'devel-stable' into for-next
arch/arm/Kconfig
arch/arm/kernel/traps.c
arch/arm/mm/nommu.c