Merge tag 'v3.12-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 8 Oct 2013 15:43:00 +0000 (08:43 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 8 Oct 2013 15:43:00 +0000 (08:43 -0700)
Merge with mainline to bring in changes to input subsystem that were
committed through other trees.

1  2 
drivers/input/serio/Kconfig

Simple merge