Merge branch 'master' into upstream.

author Jiri Kosina <[email protected]>

Wed, 18 May 2011 15:06:31 +0000 (17:06 +0200)

committer Jiri Kosina <[email protected]>

Wed, 18 May 2011 15:06:49 +0000 (17:06 +0200)
author Jiri Kosina <[email protected]>
Wed, 18 May 2011 15:06:31 +0000 (17:06 +0200)
committer Jiri Kosina <[email protected]>
Wed, 18 May 2011 15:06:49 +0000 (17:06 +0200)
diff --cc Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
Simple merge
diff --cc drivers/hid/hid-picolcd.c
Simple merge
author	Jiri Kosina <[email protected]>
	Wed, 18 May 2011 15:06:31 +0000 (17:06 +0200)
committer	Jiri Kosina <[email protected]>
	Wed, 18 May 2011 15:06:49 +0000 (17:06 +0200)
		1	2
Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-picolcd.c	patch \|	diff1 \|	diff2 \|	blob \| history