git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f27543
438a5d4
)
Merge branch 'next-s3c64xx-device' into next-merged
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 18 Dec 2008 16:17:37 +0000
(16:17 +0000)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 18 Dec 2008 16:17:37 +0000
(16:17 +0000)
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c
Trivial merge