git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bbd128b
41fa923
)
Merge branch 'uc-logic' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Sat, 23 Oct 2010 20:49:32 +0000
(22:49 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Sat, 23 Oct 2010 20:49:32 +0000
(22:49 +0200)
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff