3 files changed, 33 insertions, 17 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 63df2262d41a..fb8258ebc577 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -205,20 +205,6 @@ Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
-What:   Compaq touchscreen device emulation
-When:   Oct 2007
-Files:  drivers/input/tsdev.c
-Why:    The code says it was obsolete when it was written in 2001.
-        tslib is a userspace library which does anything tsdev can do and
-        much more besides in userspace where this code belongs. There is no
-        longer any need for tsdev and applications should have converted to
-        use tslib by now.
-        The name "tsdev" is also extremely confusing and lots of people have
-        it loaded when they don't need/use it.
-Who:    Richard Purdie <rpurdie@rpsys.net>
-
----------------------------
-
 What:   i2c-ixp2000, i2c-ixp4xx and scx200_i2c drivers
 When:   September 2007
 Why:    Obsolete. The new i2c-gpio driver replaces all hardware-specific
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fdd6dbcf864e..085e4a095eaa 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1890,9 +1890,6 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format:
                         <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
 
-        tsdev.xres=     [TS] Horizontal screen resolution.
-        tsdev.yres=     [TS] Vertical screen resolution.
-
         turbografx.map[2|3]=    [HW,JOY]
                         TurboGraFX parallel port interface
                         Format:
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index 1da566630831..11340625e363 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -281,6 +281,39 @@ downdelay
         will be rounded down to the nearest multiple.  The default
         value is 0.
 
+fail_over_mac
+
+        Specifies whether active-backup mode should set all slaves to
+        the same MAC address (the traditional behavior), or, when
+        enabled, change the bond's MAC address when changing the
+        active interface (i.e., fail over the MAC address itself).
+
+        Fail over MAC is useful for devices that cannot ever alter
+        their MAC address, or for devices that refuse incoming
+        broadcasts with their own source MAC (which interferes with
+        the ARP monitor).
+
+        The down side of fail over MAC is that every device on the
+        network must be updated via gratuitous ARP, vs. just updating
+        a switch or set of switches (which often takes place for any
+        traffic, not just ARP traffic, if the switch snoops incoming
+        traffic to update its tables) for the traditional method.  If
+        the gratuitous ARP is lost, communication may be disrupted.
+
+        When fail over MAC is used in conjuction with the mii monitor,
+        devices which assert link up prior to being able to actually
+        transmit and receive are particularly susecptible to loss of
+        the gratuitous ARP, and an appropriate updelay setting may be
+        required.
+
+        A value of 0 disables fail over MAC, and is the default.  A
+        value of 1 enables fail over MAC.  This option is enabled
+        automatically if the first slave added cannot change its MAC
+        address.  This option may be modified via sysfs only when no
+        slaves are present in the bond.
+
+        This option was added in bonding version 3.2.0.
+
 lacp_rate
 
         Option specifying the rate in which we'll ask our link partner