]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 7 Jan 2011 06:34:59 +0000 (22:34 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 7 Jan 2011 06:34:59 +0000 (22:34 -0800)
commitdab9e513c882b6608da7b8a1be5f3b9275fe5ada
tree149a96ce3727025d3b9260961ec94ba8306db278
parentc721b1706fd7ad88ec0253d67b56435d1743c515
parent8547a82e4c052ac08b2ae10e107a8293045934ac
Merge branch 'next' into for-linus

Conflicts:
include/linux/input.h
drivers/input/evdev.c
drivers/input/input.c
drivers/input/keyboard/Kconfig
drivers/input/keyboard/Makefile
drivers/input/mouse/synaptics.h
drivers/input/tablet/wacom_wac.c
include/linux/input.h