summaryrefslogtreecommitdiff
path: root/fs/dlm/lock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 16:46:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-09 16:46:06 -0800
commit35d34df711e8b44846e759d8cfddb4ec6877cccb (patch)
tree6ee37bcc2594add1050a77fdb272eda4414fe6c8 /fs/dlm/lock.c
parentab02a9540541dd7b2012f32f5e311c3cbd772387 (diff)
parent36e8695ca5dcf48c837a6efe6f780c47ac9ec808 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pseries: Disable VPNH feature powerpc/iseries: Fix early init access to lppaca
Diffstat (limited to 'fs/dlm/lock.c')
0 files changed, 0 insertions, 0 deletions