summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-20 08:43:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-20 08:43:06 -0700
commita939b96cccdb65df80a52447ec8e4a6d79c56dbb (patch)
treeb2d03cee9f019d360c03518dd447aa0e5b66db33 /fs
parent5cab3856e76f4e6dd44731cea054021105e3e02d (diff)
parent6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e (diff)
downloadlinux-a939b96cccdb65df80a52447ec8e4a6d79c56dbb.tar.bz2
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions