git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8127f4e
1a45dcf
)
Merge branch 'master' into upstream
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 2 Feb 2010 22:10:39 +0000
(23:10 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 2 Feb 2010 22:10:39 +0000
(23:10 +0100)
Conflicts:
drivers/hid/hid-ids.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff