Merge branch 'omap_fixes_a_3.3rc' of git://git.pwsan.com/linux-2.6 into fixes
authorTony Lindgren <tony@atomide.com>
Fri, 27 Jan 2012 01:00:07 +0000 (17:00 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 27 Jan 2012 01:00:07 +0000 (17:00 -0800)

Trivial merge