kernel_optimize_test/arch/arm/configs
Linus Torvalds eaed435a7b Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPFmj/AAoJEIwa5zzehBx3utoP/2JKstlluwVdoIjzLDwJIZWS
 BiFO90iC6knKHb3c4ZXBNtD4yz8ImFGr2v3IY4pR+feECu+zS/AYeynrr4AjlaRj
 2wHI3/Cl2VktlzUR0k1KqfNrt1HLpZ8myxJ/pKchU8+KnxeQwCdV7MzkxocO0Abs
 BQFhXj2WuS6b+H3kObrTy7n3tIyVeGUOW/bPU9TfWeRYEWBpGlqtPOH6A2cGi5e3
 Iu9d9MPAiMt33+e7wZdmVHFky+ueqqeKevev+Vt8/JSJbPO7EseS/sbTOZH7Q1Yc
 BWe5iARFpV9viJJMlwlO+wJ08BrqzCZ6M/mBITMAZ+a/EMYRn0TwibsWDw1GcAsA
 H04Z1TW7pjni7SNFJavW3YWIR3TAKDZqwWbekGl2RzYqKmer1Hk6gwHAhxDQlMGY
 2S7dSnw97zRA0WxW6kMPw5VY9VpDD1qjW+29UpEEePfAVhKkwE+lKYlX4k/l0ElC
 9iYNoMVlhS4d5A7ZvhNU28XyGoxzAPNA4nC5OMUARZN++oSURDJ1kGNc73WQ8IbG
 x+zZ7AFvt7y8OgZqG4bE+SeiHlYVAjtyV08WLxtDx4vTyNYuiWIXguf2hLJWEJPY
 sqPGFHrMeh9YvYOXaa+DFb0fPkBJVJt663FPZ4TG2UBlphi26Ax5FtcnSBBvY4QV
 CCen+xhdxX/dp83A/A0k
 =ZgSs
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.

* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM i.MX: Update defconfig
  ARM i.MX: Merge i.MX5 support into mach-imx
  ARM i.MX5: remove unnecessary includes from board files

Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}

Pull request had been sent to the wrong email address, but happened
before the merge window closed.  I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
2012-01-23 14:50:30 -08:00
..
acs5k_defconfig
acs5k_tiny_defconfig
afeb9260_defconfig
ag5evm_defconfig
am200epdkit_defconfig
ap4evb_defconfig
assabet_defconfig
at91cap9_defconfig
at91rm9200_defconfig
at91sam9g20_defconfig
at91sam9g45_defconfig
at91sam9rl_defconfig
at91sam9260_defconfig
at91sam9261_defconfig
at91sam9263_defconfig
at91x40_defconfig
badge4_defconfig
bcmring_defconfig
bonito_defconfig
cam60_defconfig
cerfcube_defconfig
cm_x2xx_defconfig
cm_x300_defconfig
cns3420vb_defconfig
colibri_pxa270_defconfig
colibri_pxa300_defconfig
collie_defconfig
corgi_defconfig
cpu9g20_defconfig
cpu9260_defconfig
da8xx_omapl_defconfig
davinci_all_defconfig
dove_defconfig
ebsa110_defconfig
edb7211_defconfig
em_x270_defconfig
ep93xx_defconfig
eseries_pxa_defconfig
exynos4_defconfig
ezx_defconfig
footbridge_defconfig
fortunet_defconfig
g3evm_defconfig
g4evm_defconfig
h3600_defconfig
h5000_defconfig
h7201_defconfig
h7202_defconfig
hackkit_defconfig
imote2_defconfig
imx_v4_v5_defconfig
imx_v6_v7_defconfig
integrator_defconfig
iop13xx_defconfig
iop32x_defconfig
iop33x_defconfig
ixp4xx_defconfig
ixp23xx_defconfig
ixp2000_defconfig
jornada720_defconfig
kirkwood_defconfig
kota2_defconfig
ks8695_defconfig
lart_defconfig
lpd270_defconfig
lubbock_defconfig
mackerel_defconfig
magician_defconfig
mainstone_defconfig
marzen_defconfig
mini2440_defconfig
mmp2_defconfig
msm_defconfig
mv78xx0_defconfig
mxs_defconfig
neponset_defconfig
netwinder_defconfig
netx_defconfig
nhk8815_defconfig
nuc910_defconfig
nuc950_defconfig
nuc960_defconfig
omap1_defconfig
omap2plus_defconfig
orion5x_defconfig
palmz72_defconfig
pcm027_defconfig
pleb_defconfig
pnx4008_defconfig
pxa3xx_defconfig
pxa168_defconfig
pxa255-idp_defconfig
pxa910_defconfig
qil-a9260_defconfig
raumfeld_defconfig
realview_defconfig
realview-smp_defconfig
rpc_defconfig
s3c2410_defconfig
s3c6400_defconfig
s5p64x0_defconfig
s5pc100_defconfig
s5pv210_defconfig
sam9_l9260_defconfig
shannon_defconfig
shark_defconfig
simpad_defconfig
spear3xx_defconfig
spear6xx_defconfig
spitz_defconfig
stamp9g20_defconfig
tct_hammer_defconfig
tegra_defconfig
trizeps4_defconfig
u300_defconfig
u8500_defconfig
usb-a9260_defconfig
versatile_defconfig
vexpress_defconfig
viper_defconfig
xcep_defconfig
zeus_defconfig