git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94314a4
b4cbb8a
)
Merge branch 'imx/devel' into imx/imx6q
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 13:24:28 +0000
(14:24 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 13:24:28 +0000
(14:24 +0100)
Conflicts:
arch/arm/plat-mxc/include/mach/memory.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff