| commit | aaa119a3d4e0b7421c82ae3fbe288e65d0f3485f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 12 17:18:05 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 12 17:18:05 2011 -0700 |
| tree | 134923311a0ec019a1365f3ed87ffe32dae37f19 | |
| parent | 6faf9a54156fb4d01d73344cc90cb52dda074433 [diff] | |
| parent | d419e4c0f7584ffc5c72d9aeeaac485cc756ebcf [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: fix XEN_SAVE_RESTORE Kconfig dependencies PM / Hibernate: Introduce CONFIG_HIBERNATE_CALLBACKS