projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e974c1
39dae59
)
Merge tag 'v4.14-rc8' into next
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Wed, 8 Nov 2017 02:11:56 +0000
(18:11 -0800)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Wed, 8 Nov 2017 02:11:56 +0000
(18:11 -0800)
Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
1
2
drivers/input/mouse/elan_i2c_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/touchscreen/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
drivers/media/pci/ttpci/av7110.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/input/mouse/elan_i2c_core.c
index
c33f2cc
,
6d6b092
..
2690a82
---
1
/
drivers/input/mouse/elan_i2c_core.c
---
2
/
drivers/input/mouse/elan_i2c_core.c
+++ b/
drivers/input/mouse/elan_i2c_core.c
@@@
-1259,8
-1255,10
+1259,9
@@@
static const struct acpi_device_id elan
{ "ELAN0602", 0 },
{ "ELAN0605", 0 },
{ "ELAN0608", 0 },
- { "ELAN0605", 0 },
{ "ELAN0609", 0 },
{ "ELAN060B", 0 },
+ { "ELAN0611", 0 },
{ "ELAN1000", 0 },
{ }
};
diff --cc
drivers/input/touchscreen/Makefile
Simple merge
diff --cc
drivers/media/pci/ttpci/av7110.h
Simple merge