]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'hotfixes' into devel
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 19 Mar 2008 21:59:44 +0000 (17:59 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 19 Mar 2008 21:59:44 +0000 (17:59 -0400)
1  2 
fs/nfs/read.c
fs/nfs/write.c

diff --cc fs/nfs/read.c
Simple merge
diff --cc fs/nfs/write.c
Simple merge