Merge cbus
authorTony Lindgren <tony@atomide.com>
Mon, 16 Aug 2010 06:27:43 +0000 (09:27 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Aug 2010 06:27:43 +0000 (09:27 +0300)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge