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:12:42 +0000 (15:12 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 7 Feb 2012 23:12:42 +0000 (15:12 -0800)
commit018b5e162531456aa22561024c4e9a324eae9f76
tree71bf0730b78d686385c7a44696dcb21a5f08c8bf
parent684852315dea655f788f6f1006a14b8ab86478fd
parent00482a4078f4ff0dd0638e7f2fd83e34cc402ff7
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