diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 18:01:42 +0200 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 18:01:42 +0200 |
commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /drivers/gpu/drm/gma500/Makefile | |
parent | NFS: Create custom NFS v4 write_inode() function (diff) | |
parent | VFS: Pass mount flags to sget() (diff) | |
download | linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.tar.xz linux-8626e4a42675ff9903f7d4fbf14d8ebc11b5926c.zip |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'drivers/gpu/drm/gma500/Makefile')
0 files changed, 0 insertions, 0 deletions