arch/arm/mach-omap1/board-nokia770.c · a92e7023caf6c3a58b047a4c3fc9e4981b327bb8 · Kirill Smelkov / linux

Merge branch 'fixes-gpio-to-irq' into fixes · 2533c2cf

Tony Lindgren authored Mar 29, 2012

Conflicts:
	arch/arm/mach-omap1/board-htcherald.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/plat-omap/include/plat/gpio.h
	drivers/input/serio/ams_delta_serio.c

2533c2cf

board-nokia770.c 6.24 KB

Replace board-nokia770.c