Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 21:31:44 +0000 (18:31 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 21:31:44 +0000 (18:31 -0300)
commite688ca102ed304e88d1441141e6e8a74e18aa227
tree2f9605f729c30b579684aa18f4bc8c259142868a
parent1d94a6c48f81f4990c6c6acbd80894615d93cc7f
parentd3da8a0035734529c4e26696c9a0c6cb56633838
Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'

* commit 'd3da8a0035734529c4e26696c9a0c6cb56633838':
  omx: Fix allocation check

This commit is a noop, see 16a75304fe42d3a007c78126b6370c94ccf891f6

Merged-by: James Almer <jamrial@gmail.com>