Merge branch 'pm-next-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

Browse source

...

This commit is contained in:

Tony Lindgren 2010-10-08 10:19:36 -07:00

parent bead437573 ebfa88cfa1

commit 582c77d783

2 changed files with 5 additions and 6 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

4

arch/arm/mach-omap2/cpuidle34xx.c

View file

7

arch/arm/mach-omap2/pm.h

View file