You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		13 years ago
..
Kconfig	usb: musb: fix Kconfig	14 years ago
Makefile	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
am35x.c	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
blackfin.c	usb: musb: blackfin: include prefetch head file	14 years ago
blackfin.h	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
cppi_dma.c	usb: musb: cppi: fix build errors due to DBG and missing musb variable	14 years ago
cppi_dma.h	…
da8xx.c	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
davinci.c	ARM: gpio: davinci: convert drivers to use asm/gpio.h rather than mach/gpio.h	14 years ago
davinci.h	…
musb_core.c	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	14 years ago
musb_core.h	usb: musb: tusb6010: fix compilation	14 years ago
musb_debug.h	usb: musb: drop unneeded musb_debug trickery	14 years ago
musb_debugfs.c	musb_debugfs.c: remove unneeded includes on ARM	14 years ago
musb_dma.h	…
musb_gadget.c	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb	13 years ago
musb_gadget.h	usb: musb: gadget: do not poke with gadget's list_head	14 years ago
musb_gadget_ep0.c	musb_gadget: Fix for spurious interrupts on endpoint zero.	14 years ago
musb_host.c	USB: use usb_endpoint_maxp() instead of le16_to_cpu()	14 years ago
musb_host.h	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
musb_io.h	…
musb_regs.h	usb: musb: tusb6010: fix compilation	14 years ago
musb_virthub.c	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
musbhsdma.c	USB: irq: Remove IRQF_DISABLED	14 years ago
musbhsdma.h	…
omap2430.c	usb: musb: drop a gigantic amount of ifdeferry	14 years ago
omap2430.h	…
tusb6010.c	usb: musb: tusb6010: fix compilation	14 years ago
tusb6010.h	…
tusb6010_omap.c	usb: musb: tusb6010: fix compilation	14 years ago
ux500.c	usb: musb: ux500: copy dma mask from platform device to musb device	14 years ago
ux500_dma.c	usb: musb: ux500: replace missing DBG with dev_dbg	14 years ago