Merge branch 'omap/omap1' into next/devel
authorOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:57:59 +0000 (15:57 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:57:59 +0000 (15:57 -0800)

Trivial merge