aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 15:37:51 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-14 15:37:51 -0400
commit602b9ba2cb0c62595fa94650f9826ee37f6c633c (patch)
treeaa7dce9b8b603177daf93cd58e28a6e34acfe26f /drivers/net
parent853b20396becfe9425f4d5da74e10ea67811b188 (diff)
parent902ca2297180fe97f840427c114cc6dc7e77375e (diff)
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 <arnd@arndb.de>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions