53ee677a261e3c
parent 2b1caf6ed7b888c95a1909d343799672731651a5
parent f00c9e44ad1a9660fe8cd3ca15b6cd9497172eab
author Linus Torvalds <torvalds@linux-foundation.org> 1295624017 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295624017 -0800

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