| commit | e90e4d9234c953b29267cc4fc9ad804128773313 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 21 07:28:02 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 21 07:28:02 2010 -0700 |
| tree | cd35351fa453a32ea5bd11089428e35c12049c0b | |
| parent | 05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e [diff] | |
| parent | 89d799d008710e048ee14df4f4e5441e9f4d5d50 [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: fix ast ordering for user locks dlm: cleanup remove unused code