Merge branch 'master'

3 files changed, 16 insertions, 50 deletions

diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 0f515175c72a..3c406acd4dfa 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2903,14 +2903,14 @@ Your cooperation is appreciated.
                 196 = /dev/dvb/adapter3/video0    first video decoder of fourth card
 
 
-216 char        USB BlueTooth devices
-                  0 = /dev/ttyUB0               First USB BlueTooth device
-                  1 = /dev/ttyUB1               Second USB BlueTooth device
+216 char        Bluetooth RFCOMM TTY devices
+                  0 = /dev/rfcomm0              First Bluetooth RFCOMM TTY device
+                  1 = /dev/rfcomm1              Second Bluetooth RFCOMM TTY device
                     ...
 
-217 char        USB BlueTooth devices (alternate devices)
-                  0 = /dev/cuub0                Callout device for ttyUB0
-                  1 = /dev/cuub1                Callout device for ttyUB1
+217 char        Bluetooth RFCOMM TTY devices (alternate devices)
+                  0 = /dev/curf0                Callout device for rfcomm0
+                  1 = /dev/curf1                Callout device for rfcomm1
                     ...
 
 218 char        The Logical Company bus Unibus/Qbus adapters
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 24fe8edad304..9b743198f77a 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -149,3 +149,13 @@ Files:	drivers/md/md.c
 Why:    Not reliable by design - can fail when most needed.
         Alternatives exist
 Who:    NeilBrown <neilb@suse.de>
+
+---------------------------
+
+What:   au1x00_uart driver
+When:   January 2006
+Why:    The 8250 serial driver now has the ability to deal with the differences
+        between the standard 8250 family of UARTs and their slightly strange
+        brother on Alchemy SOCs.  The loss of features is not considered an
+        issue.
+Who:    Ralf Baechle <ralf@linux-mips.org>
diff --git a/Documentation/usb/bluetooth.txt b/Documentation/usb/bluetooth.txt
deleted file mode 100644
index 774f5d3835cc..000000000000
--- a/Documentation/usb/bluetooth.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-INTRODUCTION
-
-  The USB Bluetooth driver supports any USB Bluetooth device.
-  It currently works well with the Linux USB Bluetooth stack from Axis 
-  (available at http://developer.axis.com/software/bluetooth/ ) and 
-  has been rumored to work with other Linux USB Bluetooth stacks.
-
-
-CONFIGURATION
-
-  Currently the driver can handle up to 256 different USB Bluetooth 
-  devices at once. 
-
-  If you are not using devfs:
-    The major number that the driver uses is 216 so to use the driver,
-    create the following nodes:
-        mknod /dev/ttyUB0 c 216 0
-        mknod /dev/ttyUB1 c 216 1
-        mknod /dev/ttyUB2 c 216 2
-        mknod /dev/ttyUB3 c 216 3
-                .
-                .
-                .
-        mknod /dev/ttyUB254 c 216 254
-        mknod /dev/ttyUB255 c 216 255
-
-  If you are using devfs:
-    The devices supported by this driver will show up as
-    /dev/usb/ttub/{0,1,...}
-
-  When the device is connected and recognized by the driver, the driver
-  will print to the system log, which node the device has been bound to.
-
-
-CONTACT:
-
-  If anyone has any problems using this driver, please contact me, or 
-  join the Linux-USB mailing list (information on joining the mailing 
-  list, as well as a link to its searchable archive is at 
-  http://www.linux-usb.org/ )
-
-
-Greg Kroah-Hartman
-greg@kroah.com