]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 853b203 902ca22)
Merge branch 'power' of git://github.com/hzhuang1/linux into next/pm
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:37:51 +0000 (21:37 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:37:51 +0000 (21:37 +0200)
* '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 <arnd@arndb.de>

Trivial merge
Linux kernel for KaRo TX COM modules