Russell King 8213084125 Merge NetSilicon NS93xx tree ...

Fixed conflicts:

	arch/arm/Makefile
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2007-02-18 11:27:07 +00:00

..

assabet_defconfig

[ARM] Add PM_LEGACY defaults

2006-11-26 16:39:00 +00:00

at91rm9200dk_defconfig

[ARM] Merge individual ARM sub-trees

2006-12-07 23:07:26 +00:00

at91rm9200ek_defconfig

[ARM] Merge individual ARM sub-trees

2006-12-07 23:07:26 +00:00

at91sam9260ek_defconfig

[ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ

2007-01-24 11:59:53 +00:00

at91sam9261ek_defconfig

[ARM] 4084/1: Remove CONFIG_DEBUG_WAITQ

2007-01-24 11:59:53 +00:00

at91sam9263ek_defconfig

[ARM] 4146/1: AT91: Support for AT91SAM9263-EK board.

2007-02-08 14:55:25 +00:00

ateb9200_defconfig

[ARM] 4207/1: defconfig fixes, use RTC_DRV_AT91RM9200

2007-02-16 13:03:56 +00:00

badge4_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

carmeva_defconfig

[ARM] 3956/1: AT91: Carmeva board update

2006-12-01 13:53:57 +00:00

cerfcube_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

clps7500_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

collie_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

corgi_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

csb337_defconfig

[ARM] 4207/1: defconfig fixes, use RTC_DRV_AT91RM9200

2007-02-16 13:03:56 +00:00

csb637_defconfig

[ARM] 4148/1: AT91: Physically mapped flash on CSB337 and CSB637 boards.

2007-02-08 14:55:28 +00:00

ebsa110_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

edb7211_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

ep93xx_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

footbridge_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

fortunet_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

h3600_defconfig

[ARM] Add PM_LEGACY defaults

2006-11-26 16:39:00 +00:00

h7201_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

h7202_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

hackkit_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

integrator_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

iop13xx_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

iop32x_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

iop33x_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

ixp4xx_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

ixp23xx_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

ixp2000_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

jornada720_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

kafa_defconfig

[ARM] 4207/1: defconfig fixes, use RTC_DRV_AT91RM9200

2007-02-16 13:03:56 +00:00

kb9202_defconfig

[ARM] Merge individual ARM sub-trees

2006-12-07 23:07:26 +00:00

lart_defconfig

[ARM] Add PM_LEGACY defaults

2006-11-26 16:39:00 +00:00

lpd7a400_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

lpd7a404_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

lpd270_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

lubbock_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

lusl7200_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

mainstone_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

mx1ads_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

neponset_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

netwinder_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

netx_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

ns9xxx_defconfig

[ARM] 4211/1: Provide a defconfig for ns9xxx

2007-02-17 20:05:48 +00:00

omap_h2_1610_defconfig

[ARM] Remove PM_LEGACY=y from selected ARM defconfigs

2006-11-11 22:54:07 +00:00

onearm_defconfig

[ARM] 4060/1: update several ARM defconfigs

2006-12-19 21:04:38 +00:00

pleb_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

pnx4008_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

pxa255-idp_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

realview_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

realview-smp_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

rpc_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

s3c2410_defconfig

[ARM] 4200/1: S3C2443: Update s3c2410_defconfig to add SMDK2443

2007-02-16 11:30:21 +00:00

shannon_defconfig

[ARM] Remove CONFIG_ARCH_CAMELOT from defconfigs

2006-01-09 13:32:56 +00:00

shark_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

simpad_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

spitz_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00

trizeps4_defconfig

[ARM] 3666/1: TRIZEPS4 [1/5] core

2006-06-29 16:25:37 +01:00

versatile_defconfig

[ARM] Remove DEBUG_WAITQ

2006-11-30 12:24:47 +00:00