Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c |
||
|---|---|---|
| .. | ||
| algos | ||
| busses | ||
| chips | ||
| i2c-boardinfo.c | ||
| i2c-core.c | ||
| i2c-core.h | ||
| i2c-dev.c | ||
| Kconfig | ||
| Makefile | ||
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c |
||
|---|---|---|
| .. | ||
| algos | ||
| busses | ||
| chips | ||
| i2c-boardinfo.c | ||
| i2c-core.c | ||
| i2c-core.h | ||
| i2c-dev.c | ||
| Kconfig | ||
| Makefile | ||