From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jan 2012 22:55:55 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland... 
X-Git-Tag: v3.3-rc1~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49d41bae46f15da528ef9848fd7c9d38582aa8e9;p=platform%2Fkernel%2Flinux-exynos.git

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
---

49d41bae46f15da528ef9848fd7c9d38582aa8e9