git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
72c16d9
b42065f
89759e2
)
Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into...
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 30 Apr 2013 08:19:07 +0000
(10:19 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 30 Apr 2013 08:19:07 +0000
(10:19 +0200)
Conflicts:
drivers/hid/Kconfig
Trivial merge