Merge branch 'omap/fixes-non-critical' into next/fixes-non-critical
commit5e8d3183bb605a937fc89b857691f75682aa099e
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:16:55 +0000 (13 12:16 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:16:55 +0000 (13 12:16 -0800)
treeb792a9ad2ef20d6e837c6b1749ef817c6286b44e
parent5611cc4572e889b62a7b4c72a413536bf6a9c416
parent74615d8541a99106a35d415fc61507d4218f7f9a
Merge branch 'omap/fixes-non-critical' into next/fixes-non-critical