Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Fri, 2 Jul 2010 10:39:42 +0000 (13:39 +0300)
committerTony Lindgren <tony@atomide.com>
Fri, 2 Jul 2010 10:39:42 +0000 (13:39 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge