diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-19 22:21:52 (GMT) |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-08-19 22:21:52 (GMT) |
| commit | 6a396f67d2442e30150ffb5e1142dbb2f2181d3f (patch) | |
| tree | 2ea4f3ab1d3766204a55ec26600b848ed3a7e8aa /kernel/sys.c | |
| parent | f884dcaead5f17bf586ac5fe6a3ad07b5203616a (diff) | |
| parent | cccddf4f5580131c9b963900e1d3400655e633cc (diff) | |
| download | linux-fsl-qoriq-6a396f67d2442e30150ffb5e1142dbb2f2181d3f.tar.xz | |
Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32
Conflicts:
fs/nfs/nfs4xdr.c
Diffstat (limited to 'kernel/sys.c')
0 files changed, 0 insertions, 0 deletions