Whamcloud - gitweb
b=21147 fix silent conflict with patch from bug 21379
authorJohann Lombardi <johann@granier.local>
Wed, 16 Dec 2009 12:44:56 +0000 (13:44 +0100)
committerJohann Lombardi <johann@granier.local>
Wed, 16 Dec 2009 12:44:56 +0000 (13:44 +0100)
commitd628c3c74d5ea79dc69ffce549c69abe16534c8b
treeca02a87559dd4f6ae5fbd0df6ec66b7e307d1776
parenta16975493621a7866d576d75edd5d1cb6b6ece86
b=21147 fix silent conflict with patch from bug 21379
lustre/quota/lproc_quota.c