Messages in this thread | | | Date | Tue, 13 Nov 2012 15:06:31 +1100 | From | Stephen Rothwell <> | 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |