Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Sep 2011 18:30:22 +0000 (20:30 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Sep 2011 18:30:22 +0000 (20:30 +0200)
commit15ce92861f7fe59de83667c0124a7ead3423c7a0
tree83935958fbe17d3eccec58b989c1ea740ce73870
parentd035953e59ca8bb7ffc1023efba72438524457bb
parent126caf1376e75ce597f993b66241210c7171b04e
Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes