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


Trivial merge