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)
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


Trivial merge