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