From: Olof Johansson <olof@lixom.net>
Date: Tue, 7 Feb 2012 23:12:42 +0000 (-0800)
Subject: Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91... 
X-Git-Tag: firefly_0821_release~3680^2~3195^2~6^2^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=018b5e162531456aa22561024c4e9a324eae9f76;p=firefly-linux-kernel-4.4.55.git

Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91 into at91/pm_cleanup

* 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91:
  ARM: at91: implement the standby function for pm/cpuidle
  ARM: at91: remove wait_for_interrupt definition
  ARM: at91: declare header name
  ARM: at91: coding style fixes
---

018b5e162531456aa22561024c4e9a324eae9f76