Merge branches 'devel-hwspinlock' and 'devel-mcspi' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 17 Feb 2011 18:01:18 +0000 (10:01 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 17 Feb 2011 18:01:18 +0000 (10:01 -0800)

Trivial merge