git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Fri, 18 Oct 2013 20:15:53 +0000 (22:15 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Fri, 18 Oct 2013 20:15:53 +0000 (22:15 +0200)
commit	be02d80cdf9f73bb153ec5467ee7d4e509b65a4c
tree	d2093fb49e2192e5fbfddb75c735f708f3902834	tree \| snapshot
parent	b16cb5620809872e0657d8e632d27c850bb79fa5	commit \| diff
parent	6aec3390ed566e743ab4947f10dabc67f2dcf440	commit \| diff

Merge branch 'pm-opp-next' into linux-next

* pm-opp-next:
  PM / OPP: rename header to linux/pm_opp.h
  PM / OPP: rename data structures to dev_pm equivalents
  PM / OPP: rename functions to dev_pm_opp*

Conflicts:
drivers/cpufreq/omap-cpufreq.c
drivers/devfreq/exynos/exynos5_bus.c

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/cpufreq/arm_big_little.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq-cpu0.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/exynos5440-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/imx6q-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/omap-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/devfreq/exynos/exynos5_bus.c	diff1 \|	diff2 \|	blob \| history