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)
commit7e66eaf14e19c032433be7c4df3c892fa2a5282f
tree56b0d5f9d16eb18744e102f3f216715196cd62e6
parentd3654d7ef3adad0083525cfb6fe27be62cb83d0d
parentc6a389f123b9f68d605bb7e0f9b32ec1e3e14132
Merge commit 'v3.1-rc4' into next
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/misc/ad714x-i2c.c
include/linux/input.h