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)
* commit '87a11db220dec523e39eb4af715175e150787a72':
  dnxhddata: Double frame_size for cid 1260

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

Trivial merge