Merge commit 'v3.3-rc6' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Mar 2012 18:55:17 +0000 (10:55 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 9 Mar 2012 18:55:17 +0000 (10:55 -0800)
commitb675b3667f6729dcd1036a2a129b35445947f905
tree0d58791e9063d3ca2c352da6f3e7df2bdb876f9d
parent104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0
parent192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d
Merge commit 'v3.3-rc6' into next
14 files changed:
MAINTAINERS
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/input/evdev.c
drivers/input/keyboard/nomadik-ske-keypad.c
drivers/input/keyboard/samsung-keypad.c
drivers/input/mouse/psmouse-base.c
drivers/input/mouse/sentelic.c
drivers/input/serio/at32psif.c
drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c
drivers/input/touchscreen/atmel-wm97xx.c
drivers/input/touchscreen/usbtouchscreen.c
kernel/time/timekeeping.c