Merge branch 'next/cpuidle' into next/pm

Browse source

No point maintaining two branches for power management

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2012-05-14 21:51:51 +02:00

parent 602b9ba2cb b9b6b7ae96

commit ada2e35def

2 changed files with 172 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/mach-ux500/Makefile

View file

171

arch/arm/mach-ux500/cpuidle.c

View file