Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 00:53:00 +0000 (16:53 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 00:53:00 +0000 (16:53 -0800)
1  2 
arch/arm/plat-omap/sram.c

Simple merge