git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
817a312
3e48138
181a8b9
81bb773
10e87dc
30ee72f
6e5e9a0
b2723eb
2a6cdbd
)
Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...
author
Jiri Kosina
<jkosina@suse.cz>
Mon, 22 Jun 2015 14:23:43 +0000
(16:23 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Mon, 22 Jun 2015 14:23:43 +0000
(16:23 +0200)
Conflicts:
drivers/hid/wacom_wac.c
Trivial merge