Merge remote-tracking branch 'hid/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/mouse/sentelic.c
Simple merge
diff --cc drivers/input/tablet/wacom_wac.c
Simple merge
diff --cc drivers/input/touchscreen/edt-ft5x06.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 20 Sep 2012 01:24:24 +0000 (11:24 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/sentelic.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/tablet/wacom_wac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/touchscreen/edt-ft5x06.c	patch \|	diff1 \|	diff2 \|	blob \| history