arch/arm/mach-tegra/board-trimslice.c · 335332770c68649ffeaf5dc2b58d9cd40041e295 · Kirill Smelkov / linux

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

Arnd Bergmann authored Oct 21, 2011

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

33533277

board-trimslice.c 4.33 KB

Replace board-trimslice.c