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
..
block_io.c	block: kill off REQ_UNPLUG	2011-03-10 08:52:27 +01:00
console.c	PM / VT: Cleanup #if defined uglyness and fix compile error	2011-10-16 23:28:51 +02:00
hibernate.c	PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image	2011-10-16 23:30:38 +02:00
Kconfig	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
main.c	PM: Fix build issue in main.c for CONFIG_PM_SLEEP unset	2011-10-16 23:27:46 +02:00
Makefile	PM / VT: Cleanup #if defined uglyness and fix compile error	2011-10-16 23:28:51 +02:00
power.h	PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image	2011-10-16 23:30:38 +02:00
poweroff.c	Input: sysrq - drop tty argument from sysrq ops handlers	2010-08-19 22:07:06 -07:00
process.c	PM / Hibernate: Freeze kernel threads after preallocating memory	2011-10-16 23:28:52 +02:00
qos.c	PM QoS: Add global notification mechanism for device constraints	2011-08-25 15:35:47 +02:00
snapshot.c	PM / Hibernate: Include storage keys in hibernation image on s390	2011-10-16 23:27:46 +02:00
suspend_test.c	PM: Make warning in suspend_test_finish() less likely to happen	2009-10-22 08:23:45 +09:00
suspend.c	PM / Suspend: Off by one in pm_suspend()	2011-10-16 23:27:46 +02:00
swap.c	PM / Hibernate: Improve performance of LZO/plain hibernation, checksum image	2011-10-16 23:30:38 +02:00
user.c	PM: Free memory bitmaps if opening /dev/snapshot fails	2011-06-21 23:20:06 +02:00