Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into omap...
authorTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 19:42:25 +0000 (12:42 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 6 Oct 2010 19:42:25 +0000 (12:42 -0700)

Trivial merge