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

Merge branch 'depends/rmk/gpio' into next/board 

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
	arch/arm/mach-at91/board-usb-a9263.c
	arch/arm/mach-tegra/board-paz00.h
	arch/arm/mach-tegra/board-seaboard.h
parents 3b3c2810 f55be1bf
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