Merge tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux into...
authorOlof Johansson <olof@lixom.net>
Tue, 25 Jun 2013 17:08:26 +0000 (10:08 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Jun 2013 17:08:26 +0000 (10:08 -0700)
commita6f9061408950a7e024a6403aff3f90bae6bc5f3
tree7a9c2a97d3727ed48e215b3cf58e773f72cdece5
parentab1824636dac89b48f75dba57650d24a4e38b48c
parentcdd8e498c92abd63878a5c1380217fb870ab1872
Merge tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/fixes-non-critical

From Jason Cooper:
 - mv78260: catch missing fix for mvneta register length

* tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux:
  ARM: mvebu: fix length of ethernet registers in mv78260 dtsi

Signed-off-by: Olof Johansson <olof@lixom.net>