Merge commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:35:07 +0000 (14:35 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:35:07 +0000 (14:35 +0200)
commita2426798d6020d944985c478d08d432f8dbdbf02
tree1492228ad626fc2af5b3783ca30cee8460d7ec2c
parentc096226ae614ef56985f9e90370227c6ff6b917e
parentd00bb8addccb63fa3feacb06d2a310731dc0113b
Merge commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b'

* commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b':
  mips: intreadwrite: Only execute that code for mips r1 or r2

Not merged, as FFmpeg has a separate condition to protect this code.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>