Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
Linus Torvalds [Fri, 21 Jan 2011 15:33:37 +0000 (07:33 -0800)]
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Fix deadlock during path resolution

1  2 
fs/ext3/super.c
fs/ext4/super.c
fs/ocfs2/super.c

diff --cc fs/ext3/super.c
Simple merge
diff --cc fs/ext4/super.c
Simple merge
Simple merge