Merge commit 'v3.1-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 7 Sep 2011 21:18:36 +0000 (14:18 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 7 Sep 2011 21:18:36 +0000 (14:18 -0700)
1  2 
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/misc/ad714x-i2c.c
include/linux/input.h

Simple merge
Simple merge
Simple merge
Simple merge