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