git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6f1242
1bcc206
)
Merge branch 'upstream' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 25 Oct 2011 07:59:04 +0000
(09:59 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 25 Oct 2011 07:59:04 +0000
(09:59 +0200)
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff