Olof Johansson 8b1a13b028 Merge branch 'next/drivers' into HEAD ... Conflicts: arch/arm/boot/dts/omap4.dtsi arch/arm/mach-clps711x/common.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/leds-h2p2-debug.c arch/arm/mach-omap1/leds.c arch/arm/mach-pnx4008/time.c arch/arm/plat-omap/debug-leds.c drivers/Makefile drivers/bus/omap_l3_noc.c		2012-10-01 14:33:55 -07:00
..
include/mach	ARM: shark: use fixed PCI i/o mapping	2012-07-26 09:09:58 -05:00
core.c	Merge branch 'next/drivers' into HEAD	2012-10-01 14:33:55 -07:00
dma.c	[ARM] dma: rejig DMA initialization	2008-12-11 14:32:43 +00:00
irq.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
leds.c	ARM: mach-shark: retire custom LED code	2012-08-01 11:22:05 +08:00
Makefile	ARM: mach-shark: retire custom LED code	2012-08-01 11:22:05 +08:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
pci.c	ARM: shark: use fixed PCI i/o mapping	2012-07-26 09:09:58 -05:00