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