git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35d03a0
7d876c0
0b3fa39
70c7c9c
)
Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:13 +0000
(15:31 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:13 +0000
(15:31 +0200)
Conflicts:
drivers/hid/hid-ids.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff