From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 15:33:37 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... 
X-Git-Tag: v2.6.38-rc2~15
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=4843456c5c341eb57f80f9224362a22665d14107;p=~andy%2Flinux

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Fix deadlock during path resolution
---

4843456c5c341eb57f80f9224362a22665d14107