Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 29 Jan 2013 09:48:30 +0000 (10:48 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 29 Jan 2013 09:48:30 +0000 (10:48 +0100)
Conflicts:
drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).


Trivial merge