Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:13:15 +0000 (14:13 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 30 Nov 2010 22:13:15 +0000 (14:13 -0800)
1  2  3 
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/serial.c

Simple merge
Simple merge