]> git.baikalelectronics.ru Git - kernel.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)
commit187f73db1a77098887dc644fc5add9cc653cdc37
tree77eddb6bc1d5cafdbe7f35caae11ce4fb337b2a8
parenta573c62bf985046ea1a1692adbdad5277300e696
parent52bd6a257bd17a6e354217e92fb43156f42b4a46
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