commit | c69e8839c230c60d3c5f62c8f88bd23d8d6519ee | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 12 15:54:27 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 12 15:54:27 2009 -0800 |
tree | 8d4a28c589b8df9020561e19766bb9ba9edfebbf | |
parent | 3e55f1a292583b11ff85952eec77d65a459da2dd [diff] | |
parent | c7be761a8163d2f1ac0b606c21e4316b7abc5af7 [diff] |
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: change rsbtbl rwlock to spinlock dlm: fix seq_file usage in debugfs lock dump