Skip to content
Commit 602b9ba2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 853b2039 902ca229
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment