git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
537b60d
a8ab5d5
)
Merge branch 'upstream' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Wed, 19 May 2010 12:04:49 +0000
(14:04 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Wed, 19 May 2010 12:04:49 +0000
(14:04 +0200)
Conflicts:
drivers/hid/hid-wacom.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff