git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b3d07e0
d125708
)
Merge branch 'upstream' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 22 May 2012 09:32:31 +0000
(11:32 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 22 May 2012 09:32:31 +0000
(11:32 +0200)
Conflicts:
drivers/hid/hid-core.c
Trivial merge