]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d0a9af8 2f5bf1f)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Mar 2007 21:02:03 +0000 (14:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 28 Mar 2007 21:02:03 +0000 (14:02 -0700)
commite5c465f5d957ab581bc79d3ce981281fe73021a3
treed37f808b94d0cb46e88108d422da2c22deb721b7tree | snapshot
parentd0a9af809124c432297a7c4a3bcf98cbfdb4036acommit | diff
parent2f5bf1f2d061dea5146aa283685ce2b00cea2f3dcommit | diff
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2_dlm: Check for migrateable lockres in dlm_empty_lockres()
  ocfs2_dlm: Fix lockres ref counting bug
Linux 2.6 source tree