Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:41:00 +0000 (10:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:41:00 +0000 (10:41 -0800)
commitcc597bc3d31468596af6b8ad2b1d1b593e308957
tree303754908b583ff1da423bd37b56b01bd4585106
parented803862954528e6fcf7bd0f2b2e5a772a7c3281
parentc475146d8f3b97e79f9ef88521e28ad40ac07de6
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:
  ocfs2: Remove ocfs2_dquot_initialize() and ocfs2_dquot_drop()
  quota: Improve locking