Russell King 7e69a8c4d0 Merge branch 's3c-move' into devel ...

Conflicts:

	arch/arm/mach-versatile/core.c

2008-10-14 22:24:51 +01:00

..

boot

[ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name

2008-10-03 11:32:09 +01:00

common

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

configs

Merge branch 'omap-all' into devel

2008-10-14 22:24:42 +01:00

include/asm

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

kernel

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

lib

Merge branch 'ptebits' into devel

2008-10-09 21:31:56 +01:00

mach-aaec2000

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

mach-at91

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-clps711x

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-clps7500

[ARM] mm: enable sparsemem on clps7500 and RiscPC

2008-10-01 17:24:04 +01:00

mach-davinci

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-ebsa110

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-ep93xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-footbridge

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-h720x

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-imx

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

2008-10-09 21:33:03 +01:00

mach-integrator

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-iop13xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-iop32x

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-iop33x

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-ixp4xx

[ARM] Convert asm/delay.h to linux/delay.h

2008-09-06 12:11:37 +01:00

mach-ixp23xx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-ixp2000

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-kirkwood

[ARM] Kirkwood: add support for L2 cache WB/WT selection

2008-09-25 16:29:21 -04:00

mach-ks8695

Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel

2008-10-09 21:31:54 +01:00

mach-l7200

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

mach-lh7a40x

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-loki

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-msm

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-mv78xx0

Merge branch 'for-rmk' of git://git.marvell.com/orion

2008-10-09 21:33:07 +01:00

mach-mx2

i.MX2: make SoC devices globally available

2008-09-09 10:19:41 +02:00

mach-mx3

Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

2008-10-09 21:33:05 +01:00

mach-netx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-ns9xxx

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

mach-omap1

Merge branch 'omap-all' into devel

2008-10-14 22:24:42 +01:00

mach-omap2

Merge branch 'omap-all' into devel

2008-10-14 22:24:42 +01:00

mach-orion5x

Merge branch 'for-rmk' of git://git.marvell.com/orion

2008-10-09 21:33:07 +01:00

mach-pnx4008

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-pxa

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-realview

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-rpc

[ARM] mm: enable sparsemem on clps7500 and RiscPC

2008-10-01 17:24:04 +01:00

mach-s3c2400

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-s3c2410

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2412

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2440

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2442

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-s3c2443

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-sa1100

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mach-shark

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

mach-versatile

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

mm

Merge branch 'omap-all' into devel

2008-10-14 22:24:42 +01:00

nwfpe

[ARM] Convert asm/uaccess.h to linux/uaccess.h

2008-09-06 11:35:55 +01:00

oprofile

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

plat-iop

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

plat-mxc

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

2008-10-09 21:33:03 +01:00

plat-omap

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

plat-orion

[ARM] Move include/asm-arm/plat-orion to arch/arm/plat-orion/include/plat

2008-08-09 13:44:58 +02:00

plat-s3c

[ARM] S3C24XX: Additional include moves

2008-10-07 23:09:51 +01:00

plat-s3c24xx

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00

tools

[ARM] Update mach-types

2008-09-25 10:12:25 +01:00

vfp

[ARM] 5227/1: Add the ENDPROC declarations to the .S files

2008-09-01 12:06:34 +01:00

Kconfig

Merge branch 'for-rmk' of git://git.marvell.com/orion

2008-10-09 21:33:07 +01:00

Kconfig-nommu

[ARM] 4532/1: allow configuration of processor ID

2007-10-12 23:43:02 +01:00

Kconfig.debug

[ARM] CONFIG_DEBUG_STACK_USAGE

2008-01-26 14:50:06 +00:00

Makefile

Merge branch 's3c-move' into devel

2008-10-14 22:24:51 +01:00