summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-13 15:19:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-13 15:19:39 -0700
commitcf70cc5b9d6a07d21ffd521aee690d26315d1bdf (patch)
tree4804c11071e693eb5d66799bb8e05431f7905c84 /drivers/net
parent087fbc9962e10a65fb0b542ecfc116ebf6cf1735 (diff)
parenta75b9df9d3bfc3cd1083974c045ae31ce5f3434f (diff)
downloadop-kernel-dev-cf70cc5b9d6a07d21ffd521aee690d26315d1bdf.zip
op-kernel-dev-cf70cc5b9d6a07d21ffd521aee690d26315d1bdf.tar.gz
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFSv4.1: Ensure that layoutget uses the correct gfp modes NFSv4.1: remove pnfs_layout_hdr from pnfs_destroy_all_layouts tmp_list NFSv41: Resend on NFS4ERR_RETRY_UNCACHED_REP
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud