]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bugfixes' into nfs-for-2.6.38
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 10 Jan 2011 19:48:02 +0000 (14:48 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 10 Jan 2011 19:48:02 +0000 (14:48 -0500)
commit951c31f704c1732b4edf2dd244ece0b196e042ed
treec1ec0bb12f19d91071b461cc2831d9d3dd4c74f3
parent46aaf84db4af6058e357882d1cfbab54d9d3cd1f
parent6a53960c43f884770d99d91a6f4c281befb63d24
Merge branch 'bugfixes' into nfs-for-2.6.38

Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
fs/nfs/dir.c
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
include/linux/sunrpc/xdr.h