Merge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:01:34 +0000 (17:01 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 20:01:34 +0000 (17:01 -0300)
* commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97':
  aarch64: vp9: loop_filter: fix typo in skip flatout8 check
  aarch64: vp9: Implement NEON loop filters
  arm: vp9itxfm: Simplify txfm string comparisons

These commits are a noop, see
b4dc7c341eb08b6a4d5470a05364eadf85434108
f1212e472b5f57b4f7243fc46f254647cf7e284d

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

Trivial merge