Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Tue, 3 Aug 2010 09:18:22 +0000 (12:18 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Aug 2010 09:18:22 +0000 (12:18 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge