diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 19:46:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 19:46:06 -0500 |
| commit | 35d34df711e8b44846e759d8cfddb4ec6877cccb (patch) | |
| tree | 6ee37bcc2594add1050a77fdb272eda4414fe6c8 /fs/dlm/member.c | |
| parent | ab02a9540541dd7b2012f32f5e311c3cbd772387 (diff) | |
| parent | 36e8695ca5dcf48c837a6efe6f780c47ac9ec808 (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/member.c')
0 files changed, 0 insertions, 0 deletions