Merge branch 'bfin_rotary' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
Merge bfin_rotary driver changes from Sonic Zhang.

1  2 
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/input/mouse/synaptics.c

diff --cc MAINTAINERS
Simple merge
Simple merge