[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20121113150631.e316da9049b2ce6685aa729e@canb.auug.org.au>
Date: Tue, 13 Nov 2012 15:06:31 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Michal Nazarewicz <mina86@...a86.com>,
Felipe Balbi <balbi@...com>, Greg KH <greg@...ah.com>,
"Jean-Christophe PLAGNIOL-VILLARD" <plagnioj@...osoft.com>
Subject: linux-next: manual merge of the arm-soc tree with the usb tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/configs/afeb9260_defconfig between commit 77614e025061 ("arch:
Change defconfigs to point to g_mass_storage") from the usb tree and
commit 2484575268e2 ("arm: at91: drop machine defconfig") from the
arm-soc tree.
The latter deletes the file, so I did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists