projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0bdd0f3 b36c3f8)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Mar 2007 22:29:08 +0000 (15:29 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Mar 2007 22:29:08 +0000 (15:29 -0700)
commit4e337adae4e960f64043b9f433c4a825c902616c
tree407ea9edaec1ec666e5a0a6368dc51be2bc913c9tree | snapshot
parent0bdd0f385a44344f83409b9e00797bfe2596faf8commit | diff
parentb36c3f84988eebf38acaccc756e05f6b70e333abcommit | diff
Merge branch 'upstream-linus' of /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()
John Crispins staging tree