Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 38 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd b/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd
new file mode 100644
index 000000000000..57b92cbdceae
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd
@@ -0,0 +1,38 @@
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/press_to_select
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This controls if mouse clicks should be generated if the trackpoint is quickly pressed. How fast this press has to be
+                is being controlled by press_speed.
+                Values are 0 or 1.
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/dragging
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    If this setting is enabled, it is possible to do dragging by pressing the trackpoint. This requires press_to_select to be enabled.
+                Values are 0 or 1.
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/release_to_select
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    For details regarding this setting please refer to http://www.pc.ibm.com/ww/healthycomputing/trkpntb.html
+                Values are 0 or 1.
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/select_right
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This setting controls if the mouse click events generated by pressing the trackpoint (if press_to_select is enabled) generate
+                a left or right mouse button click.
+                Values are 0 or 1.
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/sensitivity
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This file contains the trackpoint sensitivity.
+                Values are decimal integers from 1 (lowest sensitivity) to 255 (highest sensitivity).
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/press_speed
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This setting controls how fast the trackpoint needs to be pressed to generate a mouse click if press_to_select is enabled.
+                Values are decimal integers from 1 (slowest) to 255 (fastest).
+