Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:29:57 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:29:57 +0000 (16:29 -0800)
commitd40b0c348213c8259ef1aca6e71d260ad65f5da8
treedf8e5576d271542d31c48127691280d0e4359f78
parent3aec46c1e0be28ead67f53c2cade6453a7fba6e6
parent6b155c8fd4d239f7d883d455bbad1be47724bbfc
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: use single thread workqueues