Merge branch 'bugfixes' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 11 Dec 2012 14:16:26 +0000 (09:16 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 11 Dec 2012 14:16:26 +0000 (09:16 -0500)

Trivial merge