diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 16:22:31 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 16:22:46 -0500 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /Documentation | |
| parent | e006d6563bca989aeae1bc5ebc03dacdf5e15b32 (diff) | |
| parent | ee9ba0f2fd5819e377cdec974a2022a7af02a385 (diff) | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-rbd | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd index fa72ccb2282e..dbedafb095e2 100644 --- a/Documentation/ABI/testing/sysfs-bus-rbd +++ b/Documentation/ABI/testing/sysfs-bus-rbd | |||
| @@ -57,13 +57,6 @@ create_snap | |||
| 57 | 57 | ||
| 58 | $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create | 58 | $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create |
| 59 | 59 | ||
| 60 | rollback_snap | ||
| 61 | |||
| 62 | Rolls back data to the specified snapshot. This goes over the entire | ||
| 63 | list of rados blocks and sends a rollback command to each. | ||
| 64 | |||
| 65 | $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback | ||
| 66 | |||
| 67 | snap_* | 60 | snap_* |
| 68 | 61 | ||
| 69 | A directory per each snapshot | 62 | A directory per each snapshot |