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

Merge branch 'dt/gic' into next/dt 

Conflicts:
	arch/arm/include/asm/localtimer.h
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-omap2/board-generic.c
parents 86c1e5a7 f37a53cc
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