Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Mon, 5 Jul 2010 14:05:27 +0000 (17:05 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 5 Jul 2010 14:05:27 +0000 (17:05 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge