Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-wacom.c
This commit is contained in:
Jiri Kosina 2010-05-19 14:04:49 +02:00
commit 7426ef52b4
16 changed files with 679 additions and 79 deletions

View file

@ -0,0 +1,10 @@
What: /sys/class/hidraw/hidraw*/device/speed
Date: April 2010
Kernel Version: 2.6.35
Contact: linux-bluetooth@vger.kernel.org
Description:
The /sys/class/hidraw/hidraw*/device/speed file controls
reporting speed of wacom bluetooth tablet. Reading from
this file returns 1 if tablet reports in high speed mode
or 0 otherwise. Writing to this file one of these values
switches reporting speed.