]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 21 Jun 2006 00:46:21 +0000 (20:46 -0400)
commit70ac4385a13f78bc478f26d317511893741b05bd
treedafc7f3018295fc4ee00339889e4f35d5b9d7743
parentd59bf96cdde5b874a57bfd1425faa45da915d0b7
parent077e98945db7e54a9865b5f29a1f02f531eca414
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.
include/linux/fs.h
include/linux/lockd/lockd.h
include/linux/nfs4.h