]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)

Trivial merge