]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 10 Sep 2012 19:22:21 +0000 (21:22 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 10 Sep 2012 19:22:21 +0000 (21:22 +0200)
* pm-sleep-next:
  properly __init-annotate pm_sysrq_init()


Trivial merge