]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge 4.12-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jun 2017 02:17:45 +0000 (10:17 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jun 2017 02:17:45 +0000 (10:17 +0800)
commitd06838de4a015c7c4844ad3fcf63ad5e2c17b234
treeac8c5fa24458e7c6d33ceef89260a955a6ccaac8
parentd567b0fe2d63aaf5814f1b488a1b05db53f1849e
parent41f1830f5a7af77cf5c86359aba3cbd706687e52
Merge 4.12-rc6 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/adc/meson_saradc.c
drivers/staging/rtl8188eu/os_dep/mon.c