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)
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

1  2 
arch/arm/mach-shmobile/headsmp-scu.S

Simple merge