]> git.openfabrics.org - ~shefty/rdma-dev.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)
commit554738da71004d96e06fb75f4772dfc3b0f47810
tree149a96ce3727025d3b9260961ec94ba8306db278
parent7b4b30689d688d9ca2e5c3859db6bbe1c35e6014
parenta6d38f889750ed6290728a19d9dad577b147c6d0
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