projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cab385 6a7c7ea)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2009 15:43:06 +0000 (08:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2009 15:43:06 +0000 (08:43 -0700)
* '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


Trivial merge
John Crispins staging tree