Merge tag 'renesas-cleanup2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 21:37:32 +0000 (22:37 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Feb 2016 21:37:32 +0000 (22:37 +0100)
commitb8d56b61af3863276be43e7fbb8b374e96b50005
tree68f8092b4f9ba5e81b1c65dd24f58b1d3aabfd67
parent797bc813983c4299e6ddf17ec2ddf2e79f9259d7
parentcf77db5165b606fca7d1d59735528ee43202392e
Merge tag 'renesas-cleanup2-for-v4.6' of git://git./linux/kernel/git/horms/renesas into next/cleanup

Merge "Second Round of Renesas ARM Based SoC Cleanup for v4.6" from Simon Horman:

* Remove stale comment from Kconfig
* Consolidate SCU mapping code

* tag 'renesas-cleanup2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Kconfig: Get rid of old comment
  ARM: shmobile: Consolidate SCU mapping code
arch/arm/mach-shmobile/headsmp-scu.S