git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
fs/nfs/nfs4xdr.c


Trivial merge
Pandora Kernel Repository