Merge branch 'omap/fixes-non-critical' into next/fixes-non-critical

This commit is contained in:
Olof Johansson 2011-12-13 12:16:55 -08:00
commit 5e8d3183bb