projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b3480f 60f98d1)
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)
* '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


Trivial merge
Domain: System / Uncategorized;