Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap...
authorTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 18:10:36 +0000 (11:10 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 8 Oct 2010 18:10:36 +0000 (11:10 -0700)

Trivial merge