aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/dlmdomain.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 14:19:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-11 14:19:45 -0700
commit7ae1277a5202109a31d8f81ac99d4a53278dab84 (patch)
treeb32748f82150e4a37b2416ffc2d844cc7d9e7ee5 /fs/ocfs2/dlm/dlmdomain.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
parentPM / x86: Save/restore MISC_ENABLE register (diff)
downloadlinux-dev-7ae1277a5202109a31d8f81ac99d4a53278dab84.tar.xz
linux-dev-7ae1277a5202109a31d8f81ac99d4a53278dab84.zip
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / x86: Save/restore MISC_ENABLE register
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions