]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge 4.12-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Jun 2017 06:20:47 +0000 (08:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Jun 2017 06:20:47 +0000 (08:20 +0200)
commit7bf1e44f865523aa16e0eb340a82d643da9215b5
tree1ddb344169d39413053057d888edbb18dfeed880
parente5770b7bdbfe9f23bb75a7d5a88c1f5e18e20738
parent32c1431eea4881a6b17bd7c639315010aeefa452
Merge 4.12-rc5 into staging-next

We want the IIO fixes and other staging driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/proximity/as3935.c
drivers/staging/ccree/ssi_buffer_mgr.c
include/linux/tty.h