Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6