|author||Jiri Kosina <firstname.lastname@example.org>||2013-01-29 10:48:30 +0100|
|committer||Jiri Kosina <email@example.com>||2013-01-29 10:48:30 +0100|
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).
Diffstat (limited to 'drivers')