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

Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 

These are all dependencies for the renesas/boards2 branch.

Conflicts:
	arch/arm/configs/marzen_defconfig
parents 77b67063 ab6f6d85 631a7b5d 86bc52ef
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