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


Trivial merge