]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Dec 2010 16:05:22 +0000 (08:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Dec 2010 16:05:22 +0000 (08:05 -0800)
* 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: replace the rbd sysfs interface


Trivial merge