Merge branch 'bkl-removal' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:58 +0000 (18:34 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:58 +0000 (18:34 -0400)
commitcadc723cc19ce6b881d973d3c04e25ebb83058e6
tree9256b4bc0685bca22469eab87cd3ec3c2deba60d
parente89e896d31b11a51a54ddcd3f72a76bd286dd86c
parentf839c4c1991cc9b580ae38f98f54554938a7f49c
Merge branch 'bkl-removal' into next
fs/nfs/file.c