Linus Torvalds 1fdb24e969 Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits) ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET ARM: gic, local timers: use the request_percpu_irq() interface ARM: gic: consolidate PPI handling ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H ARM: mach-s5p64x0: remove mach/memory.h ARM: mach-s3c64xx: remove mach/memory.h ARM: plat-mxc: remove mach/memory.h ARM: mach-prima2: remove mach/memory.h ARM: mach-zynq: remove mach/memory.h ARM: mach-bcmring: remove mach/memory.h ARM: mach-davinci: remove mach/memory.h ARM: mach-pxa: remove mach/memory.h ARM: mach-ixp4xx: remove mach/memory.h ARM: mach-h720x: remove mach/memory.h ARM: mach-vt8500: remove mach/memory.h ARM: mach-s5pc100: remove mach/memory.h ARM: mach-tegra: remove mach/memory.h ARM: plat-tcc: remove mach/memory.h ARM: mach-mmp: remove mach/memory.h ARM: mach-cns3xxx: remove mach/memory.h ... Fix up mostly pretty trivial conflicts in: - arch/arm/Kconfig - arch/arm/include/asm/localtimer.h - arch/arm/kernel/Makefile - arch/arm/mach-shmobile/board-ap4evb.c - arch/arm/mach-u300/core.c - arch/arm/mm/dma-mapping.c - arch/arm/mm/proc-v7.S - arch/arm/plat-omap/Kconfig largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP -> CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and addition of NEED_MACH_MEMORY_H next to HAVE_IDE.		2011-10-28 12:02:27 -07:00
..
.gitignore	ARM: zImage: allow supplementing appended DTB with traditional ATAG data	2011-09-14 13:51:59 -04:00
atags_to_fdt.c	ARM: zImage: allow supplementing appended DTB with traditional ATAG data	2011-09-14 13:51:59 -04:00
big-endian.S	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
decompress.c	ARM: zImage: don't ignore error returned from decompress()	2011-05-07 00:08:01 -04:00
head-sa1100.S	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
head-shark.S	[PATCH] ARM: 2816/1: Shark: boot kernel images bigger than 1 MB	2005-07-17 20:12:08 +01:00
head-sharpsl.S	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
head-shmobile.S	ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM	2011-06-29 10:00:52 +01:00
head-vt8500.S	ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's	2011-01-25 15:07:01 +00:00
head-xscale.S	[ARM] Eliminate useless includes of asm/mach-types.h	2008-08-07 09:40:04 +01:00
head.S	ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET	2011-10-24 20:53:50 +01:00
libfdt_env.h	ARM: zImage: allow supplementing appended DTB with traditional ATAG data	2011-09-14 13:51:59 -04:00
ll_char_wr.S	[ARM] Remove LOADREGS macro	2006-06-25 11:23:45 +01:00
Makefile	Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-28 12:02:27 -07:00
misc.c	ARM: zImage: gather some string functions into string.c	2011-09-14 13:51:58 -04:00
mmcif-sh7372.c	mmc: sdhi, mmcif: zboot: Correct clock disable logic	2011-08-08 16:38:04 +09:00
ofw-shark.c	[ARM] 2922/1: compile fix for shark	2005-09-20 16:21:42 +01:00
piggy.gzip.S	arm: add support for LZO-compressed kernels	2010-01-11 09:34:05 -08:00
piggy.lzma.S	ARM: 6026/1: ARM: Add support for LZMA-compressed kernel images	2010-04-14 12:05:36 +01:00
piggy.lzo.S	arm: add support for LZO-compressed kernels	2010-01-11 09:34:05 -08:00
sdhi-sh7372.c	mmc: sdhi, mmcif: zboot: Correct clock disable logic	2011-08-08 16:38:04 +09:00
sdhi-shmobile.c	ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM	2011-06-29 10:00:52 +01:00
sdhi-shmobile.h	ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM	2011-06-29 10:00:52 +01:00
string.c	ARM: zImage: gather some string functions into string.c	2011-09-14 13:51:58 -04:00
vmlinux.lds.in	ARM: zImage: ensure it is always a multiple of 64 bits in size	2011-09-14 12:12:12 -04:00