1e7342e778
Conflicts: arch/powerpc/platforms/40x/ppc40x_simple.c |
||
---|---|---|
.. | ||
ep405.c | ||
Kconfig | ||
Makefile | ||
ppc40x_simple.c | ||
virtex.c | ||
walnut.c |
1e7342e778
Conflicts: arch/powerpc/platforms/40x/ppc40x_simple.c |
||
---|---|---|
.. | ||
ep405.c | ||
Kconfig | ||
Makefile | ||
ppc40x_simple.c | ||
virtex.c | ||
walnut.c |