summaryrefslogtreecommitdiffstats
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 16:25:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 16:25:25 -0700
commit0adfc56ce8fdc5c17630434e49f30536ba7b8559 (patch)
treeed63f34e74998a8a1550d4af61b3178e68a5d60d /Documentation/ABI
parentf23eb2b2b28547fc70df82dd5049eb39bec5ba12 (diff)
parent59c2be1e4d42c0d4949cecdeef3f37070a1fbc13 (diff)
downloadblackbird-op-linux-0adfc56ce8fdc5c17630434e49f30536ba7b8559.tar.gz
blackbird-op-linux-0adfc56ce8fdc5c17630434e49f30536ba7b8559.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: rbd: use watch/notify for changes in rbd header libceph: add lingering request and watch/notify event framework rbd: update email address in Documentation ceph: rename dentry_release -> d_release, fix comment ceph: add request to the tail of unsafe write list ceph: remove request from unsafe list if it is canceled/timed out ceph: move readahead default to fs/ceph from libceph ceph: add ino32 mount option ceph: update common header files ceph: remove debugfs debug cruft libceph: fix osd request queuing on osdmap updates ceph: preserve I_COMPLETE across rename libceph: Fix base64-decoding when input ends in newline.
Diffstat (limited to 'Documentation/ABI')
-rw-r--r--Documentation/ABI/testing/sysfs-bus-rbd2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
index 90a87e2a572b..fa72ccb2282e 100644
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -1,6 +1,6 @@
What: /sys/bus/rbd/
Date: November 2010
-Contact: Yehuda Sadeh <yehuda@hq.newdream.net>,
+Contact: Yehuda Sadeh <yehuda@newdream.net>,
Sage Weil <sage@newdream.net>
Description:
OpenPOWER on IntegriCloud