Merge commit '87a11db220dec523e39eb4af715175e150787a72'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 10:29:25 +0000 (12:29 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 10:29:25 +0000 (12:29 +0200)
commitc8c9940f47458013a0b052cb0742ef9e98642b8a
tree0e69f29ba02721defe26380af648f9ee2b71e052
parentb7601b5f3d164139391ef21d1ba19bf8b22ffa66
parent87a11db220dec523e39eb4af715175e150787a72
Merge commit '87a11db220dec523e39eb4af715175e150787a72'

* commit '87a11db220dec523e39eb4af715175e150787a72':
  dnxhddata: Double frame_size for cid 1260

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