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


Trivial merge