Merge remote-tracking branch 'input/next'

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

Thu, 1 Sep 2011 01:11:13 +0000 (11:11 +1000)

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

Thu, 1 Sep 2011 01:11:13 +0000 (11:11 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 01:11:13 +0000 (11:11 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 01:11:13 +0000 (11:11 +1000)
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/misc/Makefile
Simple merge
diff --cc drivers/input/misc/ad714x-i2c.c
Simple merge
diff --cc include/linux/input.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 1 Sep 2011 01:11:13 +0000 (11:11 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 1 Sep 2011 01:11:13 +0000 (11:11 +1000)
		1	2
drivers/input/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/ad714x-i2c.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/input.h	patch \|	diff1 \|	diff2 \|	blob \| history