Arnd Bergmann 5839fec9d8 Merge branch 'depends/rmk/memory_h' into next/fixes ...

Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2011-10-31 23:11:53 +01:00

..

include/mach

Merge branch 'depends/rmk/memory_h' into next/fixes

2011-10-31 23:11:53 +01:00

bast-ide.c

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

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

bast-irq.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

cpu-freq.c

ARM: S3C: Update Simtec copyright statements from , to - [2]

2009-12-01 01:33:51 +00:00

dma.c

ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed

2010-02-21 23:10:35 +00:00

gpio.c

ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c

2009-10-28 18:34:56 +00:00

h1940-bluetooth.c

treewide: remove duplicate includes

2011-06-20 16:08:19 +02:00

Kconfig

ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen

2010-05-19 18:25:22 +09:00

mach-amlm5900.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-bast.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-h1940.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-n30.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-otom.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-qt2410.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-smdk2410.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-tct_hammer.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

mach-vr1000.c

ARM: mach-s3c24*: convert boot_params to atag_offset

2011-08-21 17:15:09 -04:00

Makefile

ARM: S3C2410: remove the now empty mach-s3c2410/irq.c

2011-06-03 18:36:53 -07:00

Makefile.boot

ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled

2010-05-12 09:19:24 +09:00

nor-simtec.c

ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info

2011-05-20 22:27:34 +01:00

nor-simtec.h

[ARM] S3C24XX: Add physmap device for all Simtec NOR equiped boards.

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

pll.c

ARM: S3C: Update Simtec copyright statements from , to -

2009-12-01 01:33:51 +00:00

pm-h1940.S

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

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

pm.c

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

s3c2410.c

ARM / Samsung: Use struct syscore_ops for "core" power management

2011-04-24 19:16:10 +02:00

sleep.S

[ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c*

2008-10-07 22:26:09 +01:00

usb-simtec.c

ARM: SAMSUNG: Add platform data registration for OHCI

2010-01-19 09:23:51 +09:00

usb-simtec.h

[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410

2006-12-17 23:38:02 +00:00