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)
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>

Trivial merge