Skip to content
Commit 80e98a9c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'bcm/cleanup' into next/soc 

Conflicts:
	arch/arm/mach-bcm/Kconfig
parents 3c258017 eeda4cb9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment