Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-drm-fsl-dcu.git] / Documentation / devices.txt

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 53d64d382343f13ff429906f9740e8d15de18739..1d83d124056c61854c87d6fed2d68cf870b5b3af 100644 (file)
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -443,6 +443,8 @@ Your cooperation is appreciated.
                231 = /dev/snapshot     System memory snapshot device
                232 = /dev/kvm          Kernel-based virtual machine (hardware virtualization extensions)
                233 = /dev/kmview       View-OS A process with a view
+               234 = /dev/btrfs-control        Btrfs control device
+               235 = /dev/autofs       Autofs control device
                240-254                 Reserved for local use
                255                     Reserved for MISC_DYNAMIC_MINOR