From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2011 21:27:34 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: MMI-PSA29.97-13-9~19350
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f23a5e1405e47df6cdc86568ea75df266b9e151f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: Fix PM QOS's user mode interface to work with ASCII input
  PM / Hibernate: Update kerneldoc comments in hibernate.c
  PM / Hibernate: Remove arch_prepare_suspend()
  PM / Hibernate: Update some comments in core hibernate code
---

f23a5e1405e47df6cdc86568ea75df266b9e151f