From: Linus Torvalds Date: Wed, 21 Mar 2012 20:54:22 +0000 (-0700) Subject: Merge tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm X-Git-Tag: v3.4-rc1~162 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30d73f375238441d6dc31de0d90bc39f5bb0bfe5;p=pandora-kernel.git Merge tag 'dlm-3.4' of git://git./linux/kernel/git/teigland/linux-dlm Pull dlm updates for 3.4 from David Teigland: "This set includes one trivial fix, and one simple recovery speed up. Directory recovery can use the standard hash table to find resources rather than always searching the linear recovery list." * tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: last element of dlm_local_addr[] never used dlm: fix slow rsb search in dir recovery --- 30d73f375238441d6dc31de0d90bc39f5bb0bfe5 Reading git-diff-tree failed