| commit | 04ed0978d5ca5a3460a6f1f7443f8147a183669f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 02 08:05:22 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 02 08:05:22 2010 -0800 |
| tree | 91f71e29b0cb4a7d644fc64aa7d4c0ee2c4dc0a0 | |
| parent | 8520eeaa1235ee78d32558b6a57e02b236c9e588 [diff] | |
| parent | dfc5606dc51381186de765243bab340c8e021868 [diff] |
Merge branch 'rbd-sysfs' of git://git.kernel.org/pub/scm/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