]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'omap/fixes-non-critical' into next/fixes-non-critical
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:16:55 +0000 (12:16 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:16:55 +0000 (12:16 -0800)

Trivial merge