Merge branch 'osd-devel' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)

Trivial merge