Merge tag 'v3.7-rc4' into next to sync up Wacom bits
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 8 Nov 2012 16:51:52 +0000 (08:51 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 8 Nov 2012 16:51:52 +0000 (08:51 -0800)
Linux 3.7-rc4

1  2 
drivers/input/keyboard/Kconfig

Simple merge