git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c00079
fe0cdec
)
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 19:12:24 +0000
(20:12 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 19 Oct 2010 19:12:24 +0000
(20:12 +0100)
Conflicts:
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-imx/mach-cpuimx27.c
AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff