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

Merge branch 'mxs/saif' into next/drivers 

Conflicts:
	drivers/net/ethernet/cadence/Kconfig
parents 58a27374 b07fed45
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment