git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
929bd38
adefb69
)
Merge branch 'uhid' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 24 Jul 2012 11:40:06 +0000
(13:40 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 24 Jul 2012 11:40:06 +0000
(13:40 +0200)
Conflicts:
drivers/hid/Kconfig
Trivial merge