Merge cbus
authorTony Lindgren <tony@atomide.com>
Fri, 17 Sep 2010 00:03:33 +0000 (17:03 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Sep 2010 00:03:33 +0000 (17:03 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge