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)
commit022573c275500e1a50889949f679d04b5446edf6
tree766ab0e13fc38275466f8544d1bbf4982833cbff
parent516d798f656614f59553b1ff3592c2c36102b684
parenta455e2985f57e2a71566bb8850094af38b2c932d
Merge branch 'next' into for-linus

Prepare first set of updates for 3.8 merge window.
drivers/input/matrix-keymap.c
drivers/input/tablet/wacom_wac.c