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)
1  2 
arch/arm/mach-omap2/board-3430sdp.c

Simple merge