OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7dc7967
085b775
)
Merge 5.1-rc6 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:18:44 +0000
(23:18 +0200)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 21 Apr 2019 21:18:44 +0000
(23:18 +0200)
We want the fixes in here as well as this resolves an iio driver merge
issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
16 files changed:
1
2
.mailmap
patch
|
diff1
|
diff2
|
blob
|
history
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/accel/kxcjk-1013.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/adc/ad_sigma_delta.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/chemical/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/gyro/bmg160_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/gyro/mpu3050-core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/industrialio-buffer.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/industrialio-core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/comedi/drivers/ni_usb6501.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/erofs/data.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/adc/ad7192.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/iio/meter/ade7854.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/most/core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/vt/vt.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.mailmap
Simple merge
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/iio/accel/kxcjk-1013.c
Simple merge
diff --cc
drivers/iio/adc/ad_sigma_delta.c
Simple merge
diff --cc
drivers/iio/chemical/Kconfig
Simple merge
diff --cc
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
Simple merge
diff --cc
drivers/iio/gyro/bmg160_core.c
Simple merge
diff --cc
drivers/iio/gyro/mpu3050-core.c
Simple merge
diff --cc
drivers/iio/industrialio-buffer.c
Simple merge
diff --cc
drivers/iio/industrialio-core.c
Simple merge
diff --cc
drivers/staging/comedi/drivers/ni_usb6501.c
Simple merge
diff --cc
drivers/staging/erofs/data.c
Simple merge
diff --cc
drivers/staging/iio/adc/ad7192.c
Simple merge
diff --cc
drivers/staging/iio/meter/ade7854.c
Simple merge
diff --cc
drivers/staging/most/core.c
Simple merge
diff --cc
drivers/tty/vt/vt.c
Simple merge