git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
11f0d93
bca7ab3
)
Merge branch 'pxa/devel' into next/devel2
author
Arnd Bergmann
<arnd@arndb.de>
Sun, 30 Oct 2011 19:59:09 +0000
(20:59 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Sun, 30 Oct 2011 19:59:09 +0000
(20:59 +0100)
Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff