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


Trivial merge