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)
commitfa8e2458ecfc959cd627e25ba86d8eddcb63c887
treed8c9dec3dac8e97e8591e6507a619959449d6344
parentd56a289be2ce01d1aa426a6cf45dede14a8db41e
parent3d70f8c617a436c7146ecb81df2265b4626dfe89
Merge tag 'v3.7-rc4' into next to sync up Wacom bits

Linux 3.7-rc4
drivers/input/keyboard/Kconfig