From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jun 2013 16:27:40 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=7ecba6f2f3f6e862287e07908ba583199c7772a9;p=linux-edison.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This fixes a problem preventing the kernel and userland librbd
  libraries from sharing data with the new format 2 images"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: use the correct length for format 2 object names
---

7ecba6f2f3f6e862287e07908ba583199c7772a9