diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-27 02:19:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-27 02:19:30 +0100 |
| commit | 4cbd55188fe01f22783815cbb6d4f55a0ebf5969 (patch) | |
| tree | cbefb228c717bc53542452b44d5349c3665845ee /arch/frv/include/asm/shmparam.h | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| parent | dlm: use bastmode in debugfs output (diff) | |
| download | linux-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.tar.xz linux-4cbd55188fe01f22783815cbb6d4f55a0ebf5969.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: use bastmode in debugfs output
dlm: Send lockspace name with uevents
dlm: send reply before bast
dlm: fix ordering of bast and cast
Diffstat (limited to 'arch/frv/include/asm/shmparam.h')
0 files changed, 0 insertions, 0 deletions