Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2009 03:02:09 +0000 (19:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Jan 2009 03:02:09 +0000 (19:02 -0800)
commit7d8a804c594b61a05c698126165b5dc417d94a0f
tree5718ed900d1a8aa7d85eaa02dc27fda8230a688e
parentc58bd34d00e04df9a0691732086cf8102b20d907
parent722d74219ea21223c74e5e894b0afcc5e4ca75a7
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: fs/dlm/ast.c: fix warning
  dlm: add new debugfs entry
  dlm: add time stamp of blocking callback
  dlm: change lock time stamping
  dlm: improve how bast mode handling
  dlm: remove extra blocking callback check
  dlm: replace schedule with cond_resched
  dlm: remove kmap/kunmap
  dlm: trivial annotation of be16 value
  dlm: fix up memory allocation flags
fs/dlm/netlink.c