Skip to content
Commit 5d3a0a95 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup2' into HEAD 

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
	arch/arm/mach-bcmring/arch.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/dma.c
parents 7e95c548 b98138e0
Expand all Hide whitespace changes
Inline Side-by-side
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