]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-sleep-next' into linux-next
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 19 Sep 2012 20:02:00 +0000 (22:02 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 19 Sep 2012 20:02:00 +0000 (22:02 +0200)
commitabe5002737f5946e7dd61c901cf17becc21e015a
treefc7701303861dbd8a401471f0cc74c276434247f
parent55886c6137665662d025c50b9d9a9da6dd8f3869
parent88d26136a256576e444db312179e17af6dd0ea87
Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  PM: Prevent runtime suspend during system resume

Conflicts:
drivers/base/power/main.c
drivers/base/power/main.c
drivers/pci/pci-driver.c