Merge branch 'control_mcbsp_fix_2.6.37' of git://git.pwsan.com/linux-2.6 into tmp...
authorTony Lindgren <tony@atomide.com>
Fri, 1 Oct 2010 23:39:41 +0000 (16:39 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 1 Oct 2010 23:39:41 +0000 (16:39 -0700)

Trivial merge