Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace. |
||
---|---|---|
.. | ||
Makefile | ||
ali512x.c | ||
cbmem_console.c | ||
cros_ec.c | ||
cros_ec_i2c.c | ||
cros_ec_lpc.c | ||
cros_ec_spi.c | ||
ds4510.c | ||
fsl_ifc.c | ||
fsl_iim.c | ||
gpio_led.c | ||
mc9sdz60.c | ||
mxc_ocotp.c | ||
ns87308.c | ||
pdsp188x.c | ||
status_led.c | ||
twl4030_led.c |