From: Jason Cooper <jason@lakedaemon.net>
Date: Wed, 21 Nov 2012 19:57:23 +0000 (+0000)
Subject: Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of git://github.com/MISL-EBU-System... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~12^2~1^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c;p=pandora-kernel.git

Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Marvell XOR driver DT changes for 3.8

Conflicts:
	arch/arm/boot/dts/armada-xp.dtsi
---

98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c
Reading git-diff-tree failed