diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:04:35 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-24 15:04:35 -0500 |
commit | db18014f65f62879e70be55898be3fd68a3363a8 (patch) | |
tree | 90d5e33852753f43d76d25f8d22a64a9e5bd94e8 /Documentation | |
parent | c77986c78aa941af8266272841567e78b72d54cc (diff) | |
parent | 668b7b19820b0801c425d31cc27fd6f499050e5c (diff) | |
download | op-kernel-dev-db18014f65f62879e70be55898be3fd68a3363a8.zip op-kernel-dev-db18014f65f62879e70be55898be3fd68a3363a8.tar.gz |
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.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devices.txt b/Documentation/devices.txt index 10378cc..04356f5 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 |