Merge branch 'mvebu/fixes-3' into mvebu/soc
authorAndrew Lunn <andrew@lunn.ch>
Mon, 19 Jan 2015 22:00:15 +0000 (16:00 -0600)
committerAndrew Lunn <andrew@lunn.ch>
Mon, 19 Jan 2015 22:00:15 +0000 (16:00 -0600)

Trivial merge