Skip to content
GitLab
Commit 23c4c1c7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'depends/rmk/for-linus' into next/soc 

Conflicts:
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/common.c
parents e195ffbe 7b9dd471
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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