]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 11 Jan 2014 00:08:35 +0000 (01:08 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 11 Jan 2014 00:08:35 +0000 (01:08 +0100)
commit6a1c64cb401d14babf7df6307fe8ed5b9728df30
tree77eddb6bc1d5cafdbe7f35caae11ce4fb337b2a8
parent13de22c59fd1f5a452fea806a5f822883deec88b
parent158204397034f088bfd505eeee281f7072da1c24
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm into pm-apm-next

Pull APM update for 3.14-rc1 from Jiri Kosina.

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm:
  apm-emulation: add hibernation APM events to support suspend2disk