Merge branch 'master' into upstream

author Jiri Kosina <[email protected]>

Mon, 27 Aug 2012 15:04:24 +0000 (08:04 -0700)

committer Jiri Kosina <[email protected]>

Mon, 27 Aug 2012 15:05:17 +0000 (08:05 -0700)
author Jiri Kosina <[email protected]>
Mon, 27 Aug 2012 15:04:24 +0000 (08:04 -0700)
committer Jiri Kosina <[email protected]>
Mon, 27 Aug 2012 15:05:17 +0000 (08:05 -0700)
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
author	Jiri Kosina <[email protected]>
	Mon, 27 Aug 2012 15:04:24 +0000 (08:04 -0700)
committer	Jiri Kosina <[email protected]>
	Mon, 27 Aug 2012 15:05:17 +0000 (08:05 -0700)
		1	2
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history