Conflicts: arch/powerpc/sysdev/fsl_soc.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
base.c | ||
device.c | ||
gpio.c | ||
of_i2c.c | ||
platform.c |
Conflicts: arch/powerpc/sysdev/fsl_soc.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
base.c | ||
device.c | ||
gpio.c | ||
of_i2c.c | ||
platform.c |