From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 13 Apr 2015 23:50:21 +0000 (+0200)
Subject: Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=89522f0f8bd5056dec21bb7de073cbd5886e435c;p=linux-beck.git

Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/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
---

89522f0f8bd5056dec21bb7de073cbd5886e435c