Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 Dec 2010 01:33:20 +0000 (17:33 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 28 Dec 2010 01:33:20 +0000 (17:33 -0800)

Trivial merge