]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-assorted' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 21 Sep 2011 20:49:56 +0000 (22:49 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 21 Sep 2011 20:49:56 +0000 (22:49 +0200)
commitf57ecebcaf1ea7afcd7d30533bd6ca2a67a21ae8
treee0e3b5d93aea6cd246b953cb402ef0ef2f55fb52
parentf2787459c59b91e12423779ae8f911e94498bbf5
parent054c26d578ee382d0325b7a9d661725cc7fa5448
Merge branch 'pm-assorted' into linux-next

* pm-assorted:
  PM / VT: Cleanup #if defined uglyness and fix compile error

Conflicts:
kernel/power/Makefile
kernel/power/Makefile