Merge branch 'rotary-encoder' into next

Bring in updates to roraty encoder driver switching it away from legacy
platform data and over to generic device properties and adding support
for encoders using more than 2 GPIOs.

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
Simple merge