Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta). |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| sbp_target.c | ||
| sbp_target.h | ||
Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta). |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| sbp_target.c | ||
| sbp_target.h | ||