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


Trivial merge