From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the arm-soc tree with the arm tree Date: Thu, 3 May 2012 15:35:10 +1000 Message-ID: <20120503153510.ce4453a236d89250fb8dacde@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0764319034492404597==" Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King List-Id: linux-next.vger.kernel.org --===============0764319034492404597== Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__3_May_2012_15_35_10_+1000_3anisiSgjMcOf=EQ" --Signature=_Thu__3_May_2012_15_35_10_+1000_3anisiSgjMcOf=EQ Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the arm-soc tree got conflicts in arch/arm/mach-ixp2000 and arch/arm/mach-ixp23xx between commits from the arm tree and commits from the arm-soc tree. On Russell's advise, I just removed those two directories completely. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Thu__3_May_2012_15_35_10_+1000_3anisiSgjMcOf=EQ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJPohkOAAoJEECxmPOUX5FEGm8P/0GkLwnByoCKyL3+iYzAtt1d J5JN7a7DflsrfazivLgcMjqqc2YJKnfUCCX12D4/cEvXq1EtZavn4/+rvv/mhlzS TbzpQJU6bVGarxClnLAw0XmLL6DG55TR2F1gQJEzWkv3DlmKdoZ+GA+wix/hMwOu cvPrEK7NJ5Mzr8x2U6cnl845xZzv6SR8S5kb2x1TBtXR5Op285ztSaHlvhtymYfF W9scZYVFplv+RJXdgku9HYK0icfVIV9qidc+dv+mxT9TaJZ5yad9QL9HynW0dN2q HWTATnwwK6P26Eksp0dwG4HxugGLer2tWhYTnwAV0CaJIo2oKE/sCmLLNvpd/BoU 7iBA4B9kpCXS1TT6hxDKY/b0H2CWOjfsM+y0HOW4r+Ac10YTNZJccsPcrPOS47Fm fnrPkezsucaZhNK/n324jZX1uPuA0e45etD47QrYSOyk8VD7AV4Ncp0J5l5Egkcs ldGf8EaILMHIybAGdP7POgGTg420BC1/Tpm2MF0/wxIDn9cgqeqJj1DyU+HEDP2G 54Ac2rtDcGifQrpadLg8sLeNICGWfzAIm13kdZIH1J5PCursekZA2u6r7IA3nPxO wvoRlj9WsU5ZAbTKbfmfCJ/kzUSCtW4YsFO66W9wJl8feUlwUEcRQrFTTUrX9Ld2 +qy6TL2YWwTsSRhUPvK8 =YC2m -----END PGP SIGNATURE----- --Signature=_Thu__3_May_2012_15_35_10_+1000_3anisiSgjMcOf=EQ-- --===============0764319034492404597== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============0764319034492404597==--