From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Dec 2010 04:08:25 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Tag: v3.0~2662
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=086b17046c068ef3fa6e69c03c786b39ca617a0a;p=platform%2Fkernel%2Flinux-amlogic.git

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_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
---

086b17046c068ef3fa6e69c03c786b39ca617a0a