git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db58316
adb91ae
078328d
3685c18
)
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into...
author
Jiri Kosina
<jkosina@suse.cz>
Thu, 4 Jul 2013 13:02:26 +0000
(15:02 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Thu, 4 Jul 2013 13:02:26 +0000
(15:02 +0200)
Conflicts:
drivers/hid/hid-core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff