Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Tue, 24 May 2011 07:45:06 +0000 (00:45 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 24 May 2011 07:45:06 +0000 (00:45 -0700)
commit9b28b11e2a648f07c8481b9666ccf1c088e1ab74
treeac3db2d4ae69e393d8423bb8c9304c75023dc805
parentb7679ab3f70482ff4b75a8c735c8224ebedb6020
parent99aa18278e867574d72201b806f82ace07d4804b
Merge branch 'for_2.6.40/pm-cleanup' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/board-3430sdp.c