tree 027f1aac84c1c8eb990a027be963821643cf4d7f
parent da8f2e246183ae109f87694ee3f06e8fcca2931b
parent 226291aa4641fa13cb5dec3bcb3379faa83009e2
author Linus Torvalds <torvalds@linux-foundation.org> 1291694905 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1291694905 -0800

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2_connection_find() returns pointer to bad structure
  ocfs2: char is not always signed
  Ocfs2: Stop tracking a negative dentry after dentry_iput().
  ocfs2: fix memory leak
  fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock