Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 24 Feb 2010 03:22:48 +0000 (19:22 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 24 Feb 2010 03:22:48 +0000 (19:22 -0800)
commit0fdc54b2019700a4b50179914e810367c14044a3
tree73e5e34f30aec87ad4bf4423c4f95ebba576359e
parent8250a5c381cc6714a061a39cfd29d7453e8ad64b
parent79dcfdd407208cba06bd446e93b0809df1cf10d1
Merge branch 'pm-2.6.34' of git://git./linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-rx51.c