7fecc34e07
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c |
||
---|---|---|
.. | ||
at91 | ||
codecs | ||
davinci | ||
fsl | ||
omap | ||
pxa | ||
s3c24xx | ||
sh | ||
Kconfig | ||
Makefile | ||
soc-core.c | ||
soc-dapm.c |
7fecc34e07
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c |
||
---|---|---|
.. | ||
at91 | ||
codecs | ||
davinci | ||
fsl | ||
omap | ||
pxa | ||
s3c24xx | ||
sh | ||
Kconfig | ||
Makefile | ||
soc-core.c | ||
soc-dapm.c |