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)
commitb01ee53dda8bd81855b7cda0dfb7f27d1524d87f
tree71bf0730b78d686385c7a44696dcb21a5f08c8bf
parent8f9993f76aacfc58083fad04f8e1b6bbea33de23
parent00482a4078f4ff0dd0638e7f2fd83e34cc402ff7
Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91 into next/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