projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f884dca cccddf4)
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 19 Aug 2009 22:21:52 +0000 (18:21 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 19 Aug 2009 22:21:52 +0000 (18:21 -0400)
commit6a396f67d2442e30150ffb5e1142dbb2f2181d3f
tree2ea4f3ab1d3766204a55ec26600b848ed3a7e8aatree
parentf884dcaead5f17bf586ac5fe6a3ad07b5203616acommit | diff
parentcccddf4f5580131c9b963900e1d3400655e633cccommit | diff
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32

Conflicts:
fs/nfs/nfs4xdr.c
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
fs/nfs/nfs4xdr.c diff1 | diff2 | blob | history
fs/nfs/write.c diff1 | diff2 | blob | history
MicroBlaze GIT Repository