linux-next: manual merge of the arm-soc tree with the arm-currenttree
From: Stephen Rothwell
Date: Thu Apr 11 2013 - 02:21:51 EST
Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/configs/h7201_defconfig and arch/arm/configs/h7202_defconfig
between commit e42c3074c8f7 ("ARM: remove NWFPE and VFP emulation code
from the kernel") from the arm-current tree and commit 293eb135a924
("ARM: kill Hynix h720x platform") from the arm-soc tree.
The latter deleted the files, so I did that and can carry the fix as
necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature