projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6ccbcf2
dab78d7
)
Merge branch 'next' into for-linus
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Mon, 9 Jan 2012 07:38:23 +0000
(23:38 -0800)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Mon, 9 Jan 2012 07:38:23 +0000
(23:38 -0800)
1
2
drivers/input/misc/cma3000_d0x.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/mouse/sentelic.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/mouse/synaptics.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/input/tablet/wacom_wac.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/input/misc/cma3000_d0x.c
Simple merge
diff --cc
drivers/input/mouse/sentelic.c
Simple merge
diff --cc
drivers/input/mouse/synaptics.c
Simple merge
diff --cc
drivers/input/tablet/wacom_wac.c
index
2ee47d0
,
a22e778
..
88672ec
---
1
/
drivers/input/tablet/wacom_wac.c
---
2
/
drivers/input/tablet/wacom_wac.c
+++ b/
drivers/input/tablet/wacom_wac.c
@@@
-1614,8
-1775,8
+1778,9
@@@
const struct usb_device_id wacom_ids[]
{ USB_DEVICE_WACOM(0xE2) },
{ USB_DEVICE_WACOM(0xE3) },
{ USB_DEVICE_WACOM(0xE6) },
+ { USB_DEVICE_WACOM(0xEC) },
{ USB_DEVICE_WACOM(0x47) },
+ { USB_DEVICE_WACOM(0xF4) },
{ USB_DEVICE_LENOVO(0x6004) },
{ }
};