Merge cbus
authorTony Lindgren <tony@atomide.com>
Mon, 30 Aug 2010 15:56:41 +0000 (08:56 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Aug 2010 15:56:41 +0000 (08:56 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge