Merge branch 'rotary-encoder' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 4 Mar 2016 19:32:40 +0000 (11:32 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 4 Mar 2016 19:32:40 +0000 (11:32 -0800)
commit52cdce8adb635746f53306ab2599ca64902bb1dc
tree0b61680c30eb150796cf01186f15b4845cdee6dd
parent3cd47869431d7402d0613cf0f7fbb392f2b97565
parent7dde4e74744772efdc85d7ed13495c7b6a0d881b
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.
drivers/gpio/gpiolib.c
drivers/input/touchscreen/atmel_mxt_ts.c