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

Conflicts:

	arch/arm/mach-versatile/core.c

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

..

clock.c

Merge branch 's3c-move' into devel

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

dma.c

Merge branch 's3c-move' into devel

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

gpio.c

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

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

irq.c

Merge branch 's3c-move' into devel

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

Kconfig

[ARM] JIVE: Initial machine support for Logitech Jive

2008-07-03 16:51:24 +01:00

mach-jive.c

[ARM] S3C24XX: Additional include moves

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

mach-smdk2413.c

Merge branch 's3c-move' into devel

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

mach-vstms.c

Merge branch 's3c-move' into devel

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

Makefile

[ARM] JIVE: Initial machine support for Logitech Jive

2008-07-03 16:51:24 +01:00

pm.c

Merge branch 's3c-move' into devel

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

s3c2412.c

Merge branch 's3c-move' into devel

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

sleep.S

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

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