| commit | a939b96cccdb65df80a52447ec8e4a6d79c56dbb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 20 08:43:06 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 20 08:43:06 2009 -0700 |
| tree | b2d03cee9f019d360c03518dd447aa0e5b66db33 | |
| parent | 5cab3856e76f4e6dd44731cea054021105e3e02d [diff] | |
| parent | 6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e [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/Suspend: Introduce two new platform callbacks to avoid breakage