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

Merge branch 'highbank/soc' into next/soc 

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/mach-omap2/board-generic.c
	arch/arm/plat-mxc/include/mach/gpio.h
parents c72dbae9 8b61f374
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