Skip to content
GitLab
Commit 4e4f62bf authored by Grant Likely's avatar Grant Likely
Browse files

Merge commit 'v2.6.35-rc6' into devicetree/next 

Conflicts:
	arch/sparc/kernel/prom_64.c
parents 9e3288dc b37fa16e
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