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)
commit04ed0978d5ca5a3460a6f1f7443f8147a183669f
tree91f71e29b0cb4a7d644fc64aa7d4c0ee2c4dc0a0
parent8520eeaa1235ee78d32558b6a57e02b236c9e588
parentdfc5606dc51381186de765243bab340c8e021868
Merge branch 'rbd-sysfs' of git://git./linux/kernel/git/sage/ceph-client

* 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: replace the rbd sysfs interface