From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 3 Nov 2011 03:56:40 +0000 (-0400)
Subject: Merge branch 'osd-devel' into nfs-for-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=31cbecb4ab538f433145bc5a46f3bea9b9627031;p=linux-edison.git

Merge branch 'osd-devel' into nfs-for-next
---

31cbecb4ab538f433145bc5a46f3bea9b9627031