7d83f8fca5
Conflicts: arch/arm/mach-mx1/devices.c |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
addr-map.c | ||
common.c | ||
common.h | ||
db78x00-bp-setup.c | ||
irq.c | ||
pcie.c | ||
rd78x00-masa-setup.c |
7d83f8fca5
Conflicts: arch/arm/mach-mx1/devices.c |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
addr-map.c | ||
common.c | ||
common.h | ||
db78x00-bp-setup.c | ||
irq.c | ||
pcie.c | ||
rd78x00-masa-setup.c |