diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-20 15:43:06 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-20 15:43:06 (GMT) |
| commit | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (patch) | |
| tree | b2d03cee9f019d360c03518dd447aa0e5b66db33 /fs/ocfs2 | |
| parent | 5cab3856e76f4e6dd44731cea054021105e3e02d (diff) | |
| parent | 6a7c7eaf71b636f197d73b381a2ab729ebdcfb2e (diff) | |
| download | linux-a939b96cccdb65df80a52447ec8e4a6d79c56dbb.tar.xz | |
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/ocfs2')
0 files changed, 0 insertions, 0 deletions