Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
commit4843456c5c341eb57f80f9224362a22665d14107
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 15:33:37 +0000 (21 07:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 15:33:37 +0000 (21 07:33 -0800)
tree5656b405a8b1d2596e8eb748b953ee677a261e3c
parent2b1caf6ed7b888c95a1909d343799672731651a5
parentf00c9e44ad1a9660fe8cd3ca15b6cd9497172eab
Merge branch 'for_linus' of git://git./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
fs/ext3/super.c
fs/ext4/super.c
fs/ocfs2/super.c