projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
931cf48
dc1ccc4
)
Merge v3.13-rc2 into staging-next
author
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 3 Dec 2013 00:39:07 +0000
(16:39 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 3 Dec 2013 00:39:07 +0000
(16:39 -0800)
we want these fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 files changed:
1
2
drivers/iio/accel/hid-sensor-accel-3d.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/adc/mcp3422.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/gyro/hid-sensor-gyro-3d.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/light/hid-sensor-als.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/iio/magnetometer/hid-sensor-magn-3d.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/ft1000/ft1000-usb/ft1000_download.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/imx-drm/imx-drm-core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/lustre/lustre/ptlrpc/pinger.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/nvec/nvec.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6655/hostap.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6656/baseband.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/staging/vt6656/rndis.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/iio/accel/hid-sensor-accel-3d.c
Simple merge
diff --cc
drivers/iio/adc/mcp3422.c
Simple merge
diff --cc
drivers/iio/gyro/hid-sensor-gyro-3d.c
Simple merge
diff --cc
drivers/iio/light/hid-sensor-als.c
Simple merge
diff --cc
drivers/iio/magnetometer/hid-sensor-magn-3d.c
Simple merge
diff --cc
drivers/staging/ft1000/ft1000-usb/ft1000_download.c
Simple merge
diff --cc
drivers/staging/imx-drm/imx-drm-core.c
Simple merge
diff --cc
drivers/staging/lustre/lustre/ptlrpc/pinger.c
Simple merge
diff --cc
drivers/staging/nvec/nvec.c
Simple merge
diff --cc
drivers/staging/vt6655/hostap.c
Simple merge
diff --cc
drivers/staging/vt6656/baseband.c
Simple merge
diff --cc
drivers/staging/vt6656/rndis.h
Simple merge