From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 24 Oct 2012 20:18:16 +0000 (+0200)
Subject: Merge branch 'pm-sleep-next' into linux-next
X-Git-Tag: next-20121025~36^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a3fc24c49d9dabf1d8f9ad2780e0dec4a4daeadf;p=karo-tx-linux.git

Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  PM / Hibernate: use rb_entry
  PM / sysfs: replace strict_str* with kstrto*
---

a3fc24c49d9dabf1d8f9ad2780e0dec4a4daeadf