git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
77aa8e6
4d5df5d
)
Merge branch 'upstream' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000
(13:18 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000
(13:18 +0100)
Conflicts:
drivers/hid/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff