AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
66a2886d86
kernel_optimize_test/arch/arm/configs
History
Arnd Bergmann 66a2886d86 Merge branch 'spear/dt' into spear/clock 
Conflicts:
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear3xx/include/mach/misc_regs.h
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear6xx/clock.c
	arch/arm/mach-spear6xx/include/mach/misc_regs.h

Resolve even more merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-14 17:31:45 +02:00
..
acs5k_defconfig
acs5k_tiny_defconfig
afeb9260_defconfig
ag5evm_defconfig
am200epdkit_defconfig
ap4evb_defconfig
assabet_defconfig
at91rm9200_defconfig ARM: at91: refresh soc defconfig files for 3.2 2011-11-24 14:57:54 +00:00
at91sam9g20_defconfig ARM: at91: usb_a9g20 add DT i2c support 2012-03-15 23:29:39 +08:00
at91sam9g45_defconfig ARM: at91: enable additional boards in existing soc defconfig files 2011-11-24 14:57:55 +00:00
at91sam9rl_defconfig ARM: at91: refresh soc defconfig files for 3.2 2011-11-24 14:57:54 +00:00
at91sam9260_defconfig ARM: at91: enable additional boards in existing soc defconfig files 2011-11-24 14:57:55 +00:00
at91sam9261_defconfig at91sam9261: rename at91sam9261ek to at91sam9261 defconfig 2011-05-25 23:04:33 +08:00
at91sam9263_defconfig at91sam9263: merge all boards defconfig into only one 2011-05-25 23:04:32 +08:00
at91x40_defconfig arm: at91: minimal defconfig for at91x40 SoC 2011-04-23 11:03:06 +08:00
badge4_defconfig
bcmring_defconfig
bonito_defconfig ARM: mach-shmobile: Unset initramfs source in bonito defconfig. 2011-11-11 16:58:48 +09:00
cam60_defconfig
cerfcube_defconfig
cm_x2xx_defconfig
cm_x300_defconfig ARM: pxa/cm-x300: update cm_x300_defconfig 2011-07-11 14:43:28 +08:00
cns3420vb_defconfig
colibri_pxa270_defconfig
colibri_pxa300_defconfig
collie_defconfig
corgi_defconfig
cpu9g20_defconfig
cpu9260_defconfig
da8xx_omapl_defconfig
davinci_all_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
dove_defconfig ARM: Sync Marvell Dove defconfig with latest kernel 2011-05-03 15:38:52 -04:00
ebsa110_defconfig
edb7211_defconfig
em_x270_defconfig
ep93xx_defconfig
eseries_pxa_defconfig
exynos4_defconfig ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos 2011-11-06 13:54:56 +09:00
ezx_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
footbridge_defconfig
fortunet_defconfig
g3evm_defconfig
g4evm_defconfig
h3600_defconfig
h5000_defconfig
h7201_defconfig
h7202_defconfig
hackkit_defconfig
imote2_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
imx_v4_v5_defconfig ARM: imx_v4_v5_defconfig: Add support for CONFIG_REGULATOR_FIXED_VOLTAGE 2012-04-18 11:52:23 +02:00
imx_v6_v7_defconfig Merge branch 'imx/defconfig' into next/drivers 2012-03-20 22:40:37 +00:00
integrator_defconfig ARM: 7268/1: integrator: defconfig for both AP and CP 2012-01-19 23:59:39 +00:00
iop13xx_defconfig
iop32x_defconfig
iop33x_defconfig
ixp4xx_defconfig
ixp23xx_defconfig
ixp2000_defconfig
jornada720_defconfig
kirkwood_defconfig
kota2_defconfig ARM: mach-shmobile: Add kota2 defconfig. 2012-01-10 17:09:24 +09:00
ks8695_defconfig
lart_defconfig
lpc32xx_defconfig ARM: LPC32xx: Added lpc32xx_defconfig 2012-02-09 16:00:33 -08:00
lpd270_defconfig
lubbock_defconfig
mackerel_defconfig
magician_defconfig pxa: magician/hx4700: Convert to gpio-regulator from bq24022 2012-03-06 14:01:15 +08:00
mainstone_defconfig
marzen_defconfig ARM: mach-shmobile: Add marzen defconfig. 2012-01-10 16:57:48 +09:00
mini2440_defconfig ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX 2012-03-03 07:44:51 +09:00
mmp2_defconfig ARM: mmp2: update mmp2_defconfig to support mmc 2011-07-20 17:20:52 -04:00
msm_defconfig
mv78xx0_defconfig
mxs_defconfig ARM: mx28: Let audio support be built by default 2012-01-27 11:49:34 +08:00
neponset_defconfig
netwinder_defconfig
netx_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
nhk8815_defconfig
nuc910_defconfig
nuc950_defconfig
nuc960_defconfig
omap1_defconfig ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
omap2plus_defconfig omap: Run make savedefconfig on omap2plus_defconfig to shrink it 2011-05-03 02:38:02 -07:00
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 ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
realview-smp_defconfig ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
rpc_defconfig
s3c2410_defconfig ARM: s3c2410_defconfig: update s3c2410_defconfig 2012-03-03 08:55:58 +09:00
s3c6400_defconfig
s5p64x0_defconfig
s5pc100_defconfig
s5pv210_defconfig
sam9_l9260_defconfig
shannon_defconfig
shark_defconfig
simpad_defconfig
spear3xx_defconfig SPEAr: Update defconfigs 2012-05-12 21:55:43 +02:00
spear6xx_defconfig SPEAr: Update defconfigs 2012-05-12 21:55:43 +02:00
spitz_defconfig
stamp9g20_defconfig
tct_hammer_defconfig ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX 2012-03-03 07:44:51 +09:00
tegra_defconfig ARM: tegra: update defconfig 2012-03-07 14:38:49 -08:00
trizeps4_defconfig
u300_defconfig ARM: u300: update defconfig 2011-11-29 10:34:45 +01:00
u8500_defconfig ARM: ux500: update defconfig 2012-04-16 09:00:53 +02:00
usb-a9260_defconfig
versatile_defconfig ARM: 6907/1: Versatile: Use physmap driver instead of integrator-flash 2011-05-20 22:27:08 +01:00
vexpress_defconfig
viper_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
xcep_defconfig rtc: fix build warnings in defconfigs 2011-06-15 20:04:02 -07:00
zeus_defconfig ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00