Merge branch 'bugfixes' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 22:42:14 +0000 (15:42 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 1 Oct 2012 22:42:14 +0000 (15:42 -0700)

Trivial merge