Merge tag 'v4.2-rc3' into next

Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/input/joydev.c
Simple merge

diff --cc drivers/input/mouse/elan_i2c_core.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

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