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)
commitbb3613aa34a81a5e2f1227ccdb801fde04a7da10
treebb79c15d5da41113bd7b83d9e74fbfc4a1bf8569
parent6971071cdda79cad5f53ba390e466d696e7e9006
parentbb1c9034b3ce7f29d3d178a87b42b767611d6574
Merge branch 'pm-next' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/plat-omap/sram.c