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-Tag: v3.9-rc1~113^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617677295b53a40d0e54aac4cbbc216ffbc755dd;p=pandora-kernel.git

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
Reading git-diff-tree failed