Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/configs/stamp9g20_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 deleted the file so I did that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp8VjV90ghvO.pgp
Description: PGP signature
