git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1db489b
4dfdc46
)
Merge branch 'upstream-fixes' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Sun, 4 Jan 2009 00:04:09 +0000
(
01:04
+0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Sun, 4 Jan 2009 00:04:09 +0000
(
01:04
+0100)
Conflicts:
drivers/hid/hid-ids.h
Trivial merge