Merge branch 'bfin_rotary' into next

author Dmitry Torokhov <[email protected]>

Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)

committer Dmitry Torokhov <[email protected]>

Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
author Dmitry Torokhov <[email protected]>
Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
committer Dmitry Torokhov <[email protected]>
Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/mouse/synaptics.c
Simple merge
author	Dmitry Torokhov <[email protected]>
	Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
committer	Dmitry Torokhov <[email protected]>
	Mon, 16 Feb 2015 00:07:18 +0000 (16:07 -0800)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/mouse/synaptics.c	patch \|	diff1 \|	diff2 \|	blob \| history