git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56ccd18
44d27f7
4e52b53
ed13794
)
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 22 May 2012 09:33:42 +0000
(11:33 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 22 May 2012 09:35:11 +0000
(11:35 +0200)
Conflicts:
drivers/hid/hid-core.c
Trivial merge