![]() Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h |
||
---|---|---|
.. | ||
backlight.c | ||
bootx_init.c | ||
cache.S | ||
cpufreq_32.c | ||
cpufreq_64.c | ||
feature.c | ||
Kconfig | ||
low_i2c.c | ||
Makefile | ||
nvram.c | ||
pci.c | ||
pfunc_base.c | ||
pfunc_core.c | ||
pic.c | ||
pic.h | ||
pmac.h | ||
setup.c | ||
sleep.S | ||
smp.c | ||
time.c | ||
udbg_adb.c | ||
udbg_scc.c |