git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7375951
99d2490
7e41576
)
Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Thu, 21 Feb 2013 09:45:52 +0000
(10:45 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Thu, 21 Feb 2013 09:45:52 +0000
(10:45 +0100)
Conflicts:
drivers/hid/hid-core.c
Trivial merge