Skip to content
Snippets Groups Projects
Commit c39e52a7 authored by Russell King's avatar Russell King
Browse files

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap',... 

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

Conflicts:
	arch/arm/Makefile
	arch/arm/common/Makefile
	arch/arm/mm/Kconfig
parents 76225374 87160113 4fec9978 de4338f4 47ab0dee 2a847513 88341334 3e9cc705 4c18e77f f417cbad
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5431 additions and 256 deletions
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