| commit | f23a5e1405e47df6cdc86568ea75df266b9e151f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 27 14:27:34 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 27 14:27:34 2011 -0700 |
| tree | 788fab831a235ce8f143e8562d832336a595cff7 | |
| parent | d24c2af42292cb4ad9c829d71fe0d795112ca6e7 [diff] | |
| parent | 0775a60aca2375ea5598741b30d13fe6d3f15617 [diff] |
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