Merge remote-tracking branch 'input/next'

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

Tue, 26 Jul 2011 03:36:04 +0000 (13:36 +1000)

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

Tue, 26 Jul 2011 03:36:04 +0000 (13:36 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:36:04 +0000 (13:36 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:36:04 +0000 (13:36 +1000)
diff --cc drivers/input/keyboard/pmic8xxx-keypad.c
Simple merge
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/misc/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 03:36:04 +0000 (13:36 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 03:36:04 +0000 (13:36 +1000)
		1	2
drivers/input/keyboard/pmic8xxx-keypad.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history