From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 14 Mar 2007 22:29:08 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh... 
X-Git-Tag: v2.6.21-rc4~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4e337adae4e960f64043b9f433c4a825c902616c;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2_dlm: Add missing locks in dlm_empty_lockres
  ocfs2_dlm: Missing get/put lockres in dlm_run_purge_lockres
  configfs: add missing mutex_unlock()
  ocfs2: add some missing address space callbacks
  ocfs2: Concurrent access of o2hb_region->hr_task was not locked
  ocfs2: Proper cleanup in case of error in ocfs2_register_hb_callbacks()
---

4e337adae4e960f64043b9f433c4a825c902616c