Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Apr 2015 23:50:21 +0000 (01:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Apr 2015 23:50:21 +0000 (01:50 +0200)
commit89522f0f8bd5056dec21bb7de073cbd5886e435c
treef4755458dbff71851af23675417173a95271491f
parente8621d83c10ee95798bdb5e04f54439a7c1c9a2b
parent2e57dc087c27b8b0bd4a9e5f2c6f28f3cd0b47ff
Merge tag 'at91-cleanup4_bis' of git://git./linux/kernel/git/nferre/linux-at91 into next/multiplatform

Pull "Fourth batch of cleanup for 4.1" from Nicolas Ferre:

- 1 issues revealed by the kbuild test robot fixed
- move of some functions and macros into relevant files to be able to
  streamline the at91 specific header afterwards

* tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
  ARM: at91/pm: move the standby functions to pm.c
  ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/pm.c