Merge cbus
authorTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 23:12:55 +0000 (16:12 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Sep 2010 23:12:55 +0000 (16:12 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge