988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
---|---|---|
.. | ||
maple | ||
superhyway | ||
Makefile | ||
intc.c | ||
pfc.c |
988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
---|---|---|
.. | ||
maple | ||
superhyway | ||
Makefile | ||
intc.c | ||
pfc.c |