Merge branch 'devel-omap-smp-on-up' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 17:22:16 +0000 (10:22 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 27 Sep 2010 17:22:16 +0000 (10:22 -0700)

Trivial merge