projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca3c585
bb176f6
)
Merge 4.14-rc6 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 23 Oct 2017 12:29:43 +0000
(14:29 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 23 Oct 2017 12:29:43 +0000
(14:29 +0200)
We want the IIO and staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1
2
drivers/iio/adc/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/adc/at91-sama5d2_adc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/pressure/zpa2326.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/proximity/as3935.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/meter/ade7759.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/iio/adc/Kconfig
Simple merge
diff --cc
drivers/iio/adc/at91-sama5d2_adc.c
Simple merge
diff --cc
drivers/iio/pressure/zpa2326.c
Simple merge
diff --cc
drivers/iio/proximity/as3935.c
Simple merge
diff --cc
drivers/staging/iio/meter/ade7759.c
Simple merge
diff --cc
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
Simple merge