Jiri Kosina 617677295b Merge branch 'master' into for-next ... Conflicts: drivers/devfreq/exynos4_bus.c Sync with Linus' tree to be able to apply patches that are against newer code (mvneta).		2013-01-29 10:48:30 +01:00
..
devfreq.c
exynos4_bus.c	Merge branch 'master' into for-next	2013-01-29 10:48:30 +01:00
governor_performance.c
governor_powersave.c
governor_simpleondemand.c
governor_userspace.c
governor.h
Kconfig
Makefile