aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:16:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 10:16:46 -0700
commit8357422d4bf33bc2c35884d4016c3fc9efbbc1d2 (patch)
tree5779dfe36de828d3ef2dacfda48b7961cdc44525 /Documentation
parent1021a645344d4a77333e19e60d37b9343be0d7b7 (diff)
parent959eb4e5592cc0b0b07db0ca30d2b1efd790020f (diff)
downloadlinux-linaro-android-8357422d4bf33bc2c35884d4016c3fc9efbbc1d2.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: (33 commits) dm mpath: support discard dm stripe: support discards dm: split discard requests on target boundaries dm stripe: optimize sector division dm stripe: move sector translation to a function dm: error return error for discards dm delay: support discard dm: zero silently drop discards dm: use dm_target_offset macro dm: factor out max_io_len_target_boundary dm: use common __issue_target_request for flush and discard support dm: linear support discard dm crypt: simplify crypt_ctr dm crypt: simplify crypt_config destruction logic dm: allow autoloading of dm mod dm: rename map_info flush_request to target_request_nr dm ioctl: refactor dm_table_complete dm snapshot: implement merge dm: do not initialise full request queue when bio based dm ioctl: make bio or request based device type immutable ...
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devices.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index f2da781705b..d0d1df6cb5d 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -445,6 +445,7 @@ Your cooperation is appreciated.
233 = /dev/kmview View-OS A process with a view
234 = /dev/btrfs-control Btrfs control device
235 = /dev/autofs Autofs control device
+ 236 = /dev/mapper/control Device-Mapper control device
240-254 Reserved for local use
255 Reserved for MISC_DYNAMIC_MINOR