projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7c0a57d c795b33)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 21:41:28 +0000 (14:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 Aug 2009 21:41:28 +0000 (14:41 -0700)
commit2584e7986f235572d4b03bbe52fd1e85c1679b8e
tree7265bf25f3e6ab4b8f0a7e2e5d0500aa1de77b55tree | snapshot
parent7c0a57d5c47bcfc492b3139e77400f888a935c44commit | diff
parentc795b33ba171e41563ab7e25105c0cd4edd81cd7commit | diff
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2/dlm: Wait on lockres instead of erroring cancel requests
  ocfs2: Add missing lock name
  ocfs2: Don't oops in ocfs2_kill_sb on a failed mount
  ocfs2: release the buffer head in ocfs2_do_truncate.
  ocfs2: Handle quota file corruption more gracefully
Domain: SCM / Uncategorized;