git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88d5376 c3cc3bd)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 21:04:47 +0000 (14:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 May 2008 21:04:47 +0000 (14:04 -0700)
commit8c4bab3a1aadaf4e38b2bfaf557eab74322a9fd4
treed77b8771823f137a24d8af554e01f3305729f79etree | snapshot
parent88d53766bd0f3bc6e46a0dff25be147a2b98c511commit | diff
parentc3cc3bd0d36d1b16d4cb17e8fc64fff613f0b902commit | diff
Merge branch 'for-linus' of git://git./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
Pandora Kernel Repository