Skip to content
GitLab
Commit 967809bd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap1-part2' into omap1 

Conflicts:
	drivers/leds/leds-ams-delta.c
parents dcd6c922 8d09a1bb
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