Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 17 Dec 2012 06:04:14 +0000 (22:04 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 17 Dec 2012 06:04:14 +0000 (22:04 -0800)
Prepare first set of updates for 3.8 merge window.

1  2 
drivers/input/matrix-keymap.c
drivers/input/tablet/wacom_wac.c

Simple merge
Simple merge