git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7768651
d4f5f93
)
Merge branch 'mrst-touchscreen' into next
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Sun, 5 Sep 2010 19:20:24 +0000
(12:20 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Sun, 5 Sep 2010 19:20:24 +0000
(12:20 -0700)
Conflicts:
drivers/input/touchscreen/Makefile
Trivial merge