OSDN Git Service

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jul 2011 21:34:08 +0000 (14:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jul 2011 21:34:08 +0000 (14:34 -0700)
commit201f92e2ca789d529418da8fa027d5457f0df024
treef1d88a50dc95c415a2c8e9ba571620d2ca4c151c
parent6ac556daa7822fdda585e2c387739abb0646c6ef
parentec0dd267bf7d08cb30e321e45a75fd40edd7e528
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:
  SUNRPC: Fix use of static variable in rpcb_getport_async
  NFSv4.1: update nfs4_fattr_bitmap_maxsz
  SUNRPC: Fix a race between work-queue and rpc_killall_tasks
  pnfs: write: Set mds_offset in the generic layer - it is needed by all LDs