Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (aaa119a3) · Commits · android / goshawk_kernel_oplus_sdm710

Commit aaa119a3 authored Apr 12, 2011 by Linus Torvalds

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

parents 6faf9a54 d419e4c0

Hide whitespace changes

Inline Side-by-side

Please register or to comment