commit | 8c4bab3a1aadaf4e38b2bfaf557eab74322a9fd4 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 19 14:04:47 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 19 14:04:47 2008 -0700 |
tree | d77b8771823f137a24d8af554e01f3305729f79e | |
parent | 88d53766bd0f3bc6e46a0dff25be147a2b98c511 [diff] | |
parent | c3cc3bd0d36d1b16d4cb17e8fc64fff613f0b902 [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: <linux/dlm_plock.h> should be "unifdef"ed. dlm: fix plock dev_write return value dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL dlm: section mismatch warning fix dlm: convert connections_lock in a mutex