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)
commitbe26a3df0b80307bf8f73cea535c112210151bb9
tree8e3d90563b6d689ad37500929c05c211153295be
parent918cae14872c56446415299fc17cf98704c9a537
parent61b603b4ee0c70708539e2fa5c3d47f17b7c7849
Merge branch 'debug-ll' into omap-for-linus
arch/arm/mach-omap2/serial.c
arch/arm/plat-omap/common.c