Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 12 Jan 2011 06:01:45 +0000 (22:01 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 12 Jan 2011 06:01:45 +0000 (22:01 -0800)
commit01c728a246a1072fe9664b91179a47937182b0a0
treeca1e1d997284777b28981040dae97ee668aadaee
parent554738da71004d96e06fb75f4772dfc3b0f47810
parent50a88cb7eddb971077ae7dff76b116747c12c371
Merge branch 'next' into for-linus
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
include/linux/input.h