linux-next: manual merge of the arm-soc tree with the usb tree

Mon, 12 Nov 2012 20:20:55 -0800 

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                    s...@canb.auug.org.au

Attachment: pgpQ1c9zR0Q9n.pgp
Description: PGP signature

Reply via email to