git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
39ab9dd
90d95ef
)
Merge branch 'for-linus' into next
author
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 17 Jun 2008 16:02:44 +0000
(12:02 -0400)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Tue, 17 Jun 2008 16:02:44 +0000
(12:02 -0400)
Conflicts:
drivers/input/mouse/appletouch.c
Trivial merge