Skip to content
GitLab
Commit 988addf8 authored by Russell King's avatar Russell King
Browse files

Merge branch 'origin' into devel-stable 

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
parents 004c1c70 25cf84cf
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment