From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 06:26:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'mvebu/for-next'
X-Git-Tag: next-20130619~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e22d05f5f976b47c08f2e51e5d63a8f78afe6e6e;p=karo-tx-linux.git

Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
	arch/arm/boot/dts/kirkwood-6281.dtsi
---

e22d05f5f976b47c08f2e51e5d63a8f78afe6e6e