Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2012 22:55:55 +0000 (14:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Jan 2012 22:55:55 +0000 (14:55 -0800)
commit49d41bae46f15da528ef9848fd7c9d38582aa8e9
tree76907a9a5066642a32cb238ef8d8367fc612d064
parent7b3480f8b701170c046e1ed362946f5f0d005e13
parent60f98d1839376d30e13f3e452dce2433fad3060e
Merge branch 'for-linus' of git://git./linux/kernel/git/teigland/linux-dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: add recovery callbacks
  dlm: add node slots and generation
  dlm: move recovery barrier calls
  dlm: convert rsb list to rb_tree