From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 29 Jan 2013 09:48:30 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=617677295b53a40d0e54aac4cbbc216ffbc755dd

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).
---

617677295b53a40d0e54aac4cbbc216ffbc755dd
diff --cc drivers/devfreq/exynos4_bus.c
index e1ac076c2917,46d94e9e95b5..3f37f3b3f268
--- a/drivers/devfreq/exynos4_bus.c
+++ b/drivers/devfreq/exynos4_bus.c
@@@ -636,7 -658,7 +658,7 @@@ static int exynos4_bus_target(struct de
  	if (old_freq == freq)
  		return 0;
  
- 	dev_dbg(dev, "targeting %lukHz %luuV\n", freq, opp_get_voltage(opp));
 -	dev_dbg(dev, "targetting %lukHz %luuV\n", freq, new_oppinfo.volt);
++	dev_dbg(dev, "targeting %lukHz %luuV\n", freq, new_oppinfo.volt);
  
  	mutex_lock(&data->lock);