Merge branch 'pm-next-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:19:36 +0000 (10:19 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 17:19:36 +0000 (10:19 -0700)
commit582c77d783e0cb1e6c30a330e42582173bcadfd2
tree52847c9701c1ba13e570e0c273a4ea73cbc9ee3a
parentbead4375731ad283cccbcbcb55bc7549c9746168
parentebfa88cfa1f00022c500e35db63b5f6c977c95c0
Merge branch 'pm-next-2' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus