git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7250dc3
74a3e0c
8a09b4f
)
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech...
author
Jiri Kosina
<jkosina@suse.cz>
Mon, 22 Jun 2015 14:22:06 +0000
(16:22 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Mon, 22 Jun 2015 14:22:06 +0000
(16:22 +0200)
Conflicts:
drivers/hid/hid-logitech-hidpp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff