From: Arnd Bergmann Date: Mon, 14 May 2012 19:37:51 +0000 (+0200) Subject: Merge branch 'power' of git://github.com/hzhuang1/linux into next/pm X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=602b9ba2cb0c62595fa94650f9826ee37f6c633c;p=linux-beck.git Merge branch 'power' of git://github.com/hzhuang1/linux into next/pm * 'power' of git://github.com/hzhuang1/linux: ARM: mmp: add pm support for pxa910 ARM: mmp: ttc_dkb: add PMIC support ARM: cache: tauros2: add disable and resume callback ARM: mm: proc-mohawk: add suspend resume for mohawk ARM: mmp: add PM support for mmp2 ARM: mmp: move XX_REG definition to addr-map.h Signed-off-by: Arnd Bergmann --- 602b9ba2cb0c62595fa94650f9826ee37f6c633c