From: Thomas Petazzoni Date: Tue, 20 Nov 2012 22:40:29 +0000 (+0100) Subject: Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW... X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~12^2~1^2~1^2~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=895e4e3a7da0fea246e736dd815b4d04851ea387;p=pandora-kernel.git Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge Marvell XOR driver DT changes for 3.8 Conflicts: arch/arm/boot/dts/armada-xp.dtsi Signed-off-by: Thomas Petazzoni --- 895e4e3a7da0fea246e736dd815b4d04851ea387 Reading git-diff-tree failed