Merge tag 'linus/v3.15-rc6'
LIS302: added to our uDev rules so that a node /dev/input/accel2 is created

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>