]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6bbf38d603156d95d56160a42fe3fa4defea87a4
treed891717264d39b30ec2155f46a2b78d9d914f400tree | snapshot
parent97200faca5a1567778b9fd983f76877556a7f032commit | 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