Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91...
authorOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:07:37 +0000 (15:07 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:07:37 +0000 (15:07 -0800)
* '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


Trivial merge