Whamcloud - gitweb
resolve conflicts
authornikita <nikita>
Fri, 16 Jun 2006 11:10:38 +0000 (11:10 +0000)
committernikita <nikita>
Fri, 16 Jun 2006 11:10:38 +0000 (11:10 +0000)
commit6815dcb9018a89a1dd06f3e59a46a6818803d391
treee662d3989d2baf5bccfd03251add51a6ceb597d0
parentf2ce26c3f7ae2cf89b6db33be0f48ba3eecfa7e6
resolve conflicts
lustre/ptlrpc/layout.c