From: Brian Norris <computersforpeace@gmail.com>
Date: Wed, 11 Jun 2014 06:21:12 +0000 (-0700)
Subject: Merge MTD pullreq from 3.15-rc5
X-Git-Tag: v3.16-rc1~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1900c79633e9ed757319e63aefb8e29443ea35e;p=ceph-client.git

Merge MTD pullreq from 3.15-rc5
---

f1900c79633e9ed757319e63aefb8e29443ea35e