git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bac3fcf
08268b7
)
Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx...
author
Uwe Kleine-König
<u.kleine-koenig@pengutronix.de>
Thu, 25 Feb 2010 13:01:49 +0000
(14:01 +0100)
committer
Uwe Kleine-König
<u.kleine-koenig@pengutronix.de>
Thu, 25 Feb 2010 13:01:49 +0000
(14:01 +0100)
Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled
in
03e09cd8902717b66f940357257d8ad76114d9f2
.
arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in
5e2e95f520538e095d10456acd28d9107317aa32
and got bug fixed in
5c17ef878fa25e04b1e8f1d8f5fa8b267753472c
. The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad565c9bbceeed8b607f140c29df97355
, so
arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted.
Conflicts:
arch/arm/plat-mxc/Kconfig
arch/arm/plat-mxc/Makefile
arch/arm/plat-mxc/iomux-mx1-mx2.c
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Trivial merge