| commit | 04ed0978d5ca5a3460a6f1f7443f8147a183669f | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 2 Dec 2010 16:05:22 +0000 (2 08:05 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 2 Dec 2010 16:05:22 +0000 (2 08:05 -0800) | ||
| tree | 91f71e29b0cb4a7d644fc64aa7d4c0ee2c4dc0a0 | treesnapshot (tar.gz zip) |
| parent | 8520eeaa1235ee78d32558b6a57e02b236c9e588 | commitdiff |
| parent | dfc5606dc51381186de765243bab340c8e021868 | commitdiff |
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
* 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: replace the rbd sysfs interface