988addf82e
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c |
||
---|---|---|
.. | ||
include/mach | ||
addr-map.c | ||
buffalo-wxl-setup.c | ||
common.c | ||
common.h | ||
db78x00-bp-setup.c | ||
irq.c | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
mpp.c | ||
mpp.h | ||
pcie.c | ||
rd78x00-masa-setup.c |