git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6faf9a5 d419e4c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 00:18:05 +0000 (17:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Apr 2011 00:18:05 +0000 (17:18 -0700)
* '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

1  2 
drivers/base/platform.c patch | diff1 | diff2 | blob | history

diff --cc drivers/base/platform.c
Simple merge
Pandora Kernel Repository