Merge cbus
authorTony Lindgren <tony@atomide.com>
Fri, 27 Aug 2010 21:34:55 +0000 (14:34 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 27 Aug 2010 21:34:55 +0000 (14:34 -0700)
Conflicts:
arch/arm/mach-omap2/board-n8x0.c


Trivial merge