]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1c0bfc5 af0fa9c)
Merge branch 'pm-assorted' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 18 Sep 2011 12:39:05 +0000 (14:39 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 18 Sep 2011 12:39:05 +0000 (14:39 +0200)
commita5232e4d60e0100d2e2c5abba04054fc4a320e0c
tree463c98f25930ff729ca8456e4e5ddfe64527d9d1tree | snapshot
parent1c0bfc5bc8ea7b0ebf9efc493733df04813bf7edcommit | diff
parentaf0fa9cb7923ad65da11a71cef89fc4860fb618acommit | diff
Merge branch 'pm-assorted' into linux-next

* pm-assorted:
  PM / Hibernate: Include storage keys in hibernation image on s390
  PM: Fix build issue in main.c for CONFIG_PM_SLEEP unset
  PM / Suspend: Add statistics debugfs file for suspend to RAM
drivers/base/power/main.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules