Skip to content
Snippets Groups Projects
Commit 61767729 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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).
parents 5c8d1b68 6abb7c25
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 622 additions and 48 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment