]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97200fa af0fa9c)
Merge branch 'pm-assorted' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 25 Aug 2011 13:39:07 +0000 (15:39 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 25 Aug 2011 13:39:07 +0000 (15:39 +0200)
* 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

1  2 
drivers/base/power/main.c patch | diff1 | diff2 | blob | history

diff --cc drivers/base/power/main.c
Simple merge
Linux kernel for KaRo TX COM modules