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
..
am35x.c
blackfin.c	usb: musb: blackfin: include prefetch head file	2011-08-12 11:52:51 +03:00
blackfin.h
cppi_dma.c	usb: musb: cppi: fix build errors due to DBG and missing musb variable	2011-08-12 11:52:47 +03:00
cppi_dma.h
da8xx.c
davinci.c	ARM: gpio: davinci: convert drivers to use asm/gpio.h rather than mach/gpio.h	2011-08-08 14:27:55 +01:00
davinci.h
Kconfig	usb: musb: fix Kconfig	2011-08-12 11:52:36 +03:00
Makefile
musb_core.c	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-07-25 23:08:32 -07:00
musb_core.h	usb: musb: tusb6010: fix compilation	2011-08-12 11:52:50 +03:00
musb_debug.h
musb_debugfs.c	musb_debugfs.c: remove unneeded includes on ARM	2011-09-26 10:08:31 -04:00
musb_dma.h
musb_gadget_ep0.c	musb_gadget: Fix for spurious interrupts on endpoint zero.	2011-09-09 15:58:02 -07:00
musb_gadget.c	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb	2011-10-25 12:23:15 +02:00
musb_gadget.h
musb_host.c	USB: use usb_endpoint_maxp() instead of le16_to_cpu()	2011-08-23 09:47:40 -07:00
musb_host.h
musb_io.h
musb_regs.h	usb: musb: tusb6010: fix compilation	2011-08-12 11:52:50 +03:00
musb_virthub.c
musbhsdma.c	USB: irq: Remove IRQF_DISABLED	2011-09-18 01:39:36 -07:00
musbhsdma.h
omap2430.c
omap2430.h
tusb6010_omap.c	usb: musb: tusb6010: fix compilation	2011-08-12 11:52:50 +03:00
tusb6010.c	usb: musb: tusb6010: fix compilation	2011-08-12 11:52:50 +03:00
tusb6010.h
ux500_dma.c	usb: musb: ux500: replace missing DBG with dev_dbg	2011-08-12 11:52:46 +03:00
ux500.c