]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 21:27:34 +0000 (14:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 21:27:34 +0000 (14:27 -0700)
commitf9ee36f8a556a6644212e6716c50e79147a1b839
tree788fab831a235ce8f143e8562d832336a595cff7
parent44a5d6e1b187be14fb7b975b75cec7daa9f0103b
parenta62f363b104ac278265903eaacf00535a948a219
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
kernel/pm_qos_params.c