Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Wed, 7 Jul 2010 12:40:09 +0000 (15:40 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Jul 2010 12:40:09 +0000 (15:40 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge