Merge for-next
authorTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 15:33:20 +0000 (18:33 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Aug 2010 15:33:20 +0000 (18:33 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge