git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4f5a810
fb4d8d9
)
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 30 Apr 2013 08:17:48 +0000
(10:17 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 30 Apr 2013 08:17:48 +0000
(10:17 +0200)
Conflicts:
drivers/hid/hid-multitouch.c
Trivial merge