summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-02-24 21:04:35 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-02-24 21:04:35 +0100
commitdb18014f65f62879e70be55898be3fd68a3363a8 (patch)
tree90d5e33852753f43d76d25f8d22a64a9e5bd94e8 /Documentation
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff)
parentBluetooth: Fix iterating wrong list in hci_remove_irk() (diff)
downloadlinux-db18014f65f62879e70be55898be3fd68a3363a8.tar.xz
linux-db18014f65f62879e70be55898be3fd68a3363a8.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
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 10378cc48374..04356f5bc3af 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -353,6 +353,7 @@ Your cooperation is appreciated.
133 = /dev/exttrp External device trap
134 = /dev/apm_bios Advanced Power Management BIOS
135 = /dev/rtc Real Time Clock
+ 137 = /dev/vhci Bluetooth virtual HCI driver
139 = /dev/openprom SPARC OpenBoot PROM
140 = /dev/relay8 Berkshire Products Octal relay card
141 = /dev/relay16 Berkshire Products ISO-16 relay card