Merge branch 'bugfixes' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 21 May 2012 14:12:39 +0000 (10:12 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 21 May 2012 14:12:39 +0000 (10:12 -0400)

Trivial merge