Merge cbus
authorTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:13:57 +0000 (15:13 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Sep 2010 22:13:57 +0000 (15:13 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge