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

Merge branch 'master' into for-next 

Conflicts:
	arch/arm/mach-omap1/board-nokia770.c
parents 426d3107 f6cec0ae
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 598 additions and 412 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment