7d83f8fca5
Conflicts: arch/arm/mach-mx1/devices.c |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
adssphere.c | ||
clock.c | ||
core.c | ||
dma-m2p.c | ||
edb9302.c | ||
edb9302a.c | ||
edb9307.c | ||
edb9307a.c | ||
edb9312.c | ||
edb9315.c | ||
edb9315a.c | ||
gesbc9312.c | ||
gpio.c | ||
micro9.c | ||
ts72xx.c |