Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Mon, 31 Jan 2011 21:20:26 +0000 (13:20 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 31 Jan 2011 21:20:26 +0000 (13:20 -0800)
commit112258b1d215a16d575dc6ace344a0bb7196c19c
treed96e08ee64f1c98da9da6156ef12954869846db4
parent0e6d8cad448bde3d846961bb43db15daae94562e
parent8353584eae4af8f37e5a23b63ed816c79185a9c9
Merge branch 'for_2.6.38/pm-fixes' of ssh:///linux/kernel/git/khilman/linux-omap-pm into devel-fixes
arch/arm/mach-omap2/pm34xx.c