Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jul 2009 16:35:50 +0000 (09:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jul 2009 16:35:50 +0000 (09:35 -0700)
commit728b690fd5c185c639a5db0819bd6e0385b14188
treeee5d5c9791a88bfe71bba747979d05af7bd28090
parented7ba2ef09254b2fd9698708b407f4652d26e36a
parentd01730d74d2b0155da50d44555001706294014f7
Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-quota-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6:
  quota: Fix possible deadlock during parallel quotaon and quotaoff