Merge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:59:10 +0000 (10:59 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:59:10 +0000 (10:59 +0200)
commitaa7976fd15501f861fdceb07b45279c5d6409b1b
tree6e8b8ac512e6e9c8fde2c6e9b82d9ff27313afdf
parent71c22fb7aec9a3f81c00bdc990e14a276bf163a4
parent392caa65df3efa8b2d48a80f08a6af4892c61c08
Merge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'

* commit '392caa65df3efa8b2d48a80f08a6af4892c61c08':
  arm: vp9mc: Insert a literal pool at the middle of the file

This commit is a noop, see 68caef9d48c4f1540b1b3181ebe7062a3417c62a

Merged-by: Clément Bœsch <cboesch@gopro.com>