Merge branch 'debug-ll' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 15 Feb 2010 17:26:07 +0000 (09:26 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 15 Feb 2010 17:26:07 +0000 (09:26 -0800)
1  2 
arch/arm/mach-omap2/serial.c
arch/arm/plat-omap/common.c

Simple merge
Simple merge