]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input...
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Dec 2010 17:17:48 +0000 (09:17 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 16 Dec 2010 17:17:48 +0000 (09:17 -0800)
commita145d23a46f878c1a0292ae348d0f58d0a43d920
treec076d2f0b5d4ae8726a50206042d3e3a41620fe4
parentfcfab9841ea0b5cc5fd5219cc7fdda0ef09299dd
parent992fd1b9bdfc2bfc4bc23c6281ce7e6cbd05767d
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next

Conflicts:
drivers/input/Makefile
drivers/input/Makefile
drivers/input/input.c
include/linux/input.h