Russell King 2d13ccaa87 Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable ...

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.

2011-11-21 21:56:56 +00:00

..

include/plat

Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

2011-11-21 21:56:56 +00:00

clock.c

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00

common.c

ARM: omap: move omap_board_config_kernel to .init.data

2011-02-09 16:36:41 -08:00

counter_32k.c

Convert OMAPs 32kHz clocksource implementation to use the generic MMIO

2011-07-10 23:05:34 -07:00

cpu-omap.c

arm: omap: fix section mismatch warning

2011-03-02 16:32:52 -08:00

debug-devices.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

debug-leds.c

ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h

2011-08-08 14:27:41 +01:00

devices.c

Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 20:11:00 -07:00

dma.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

dmtimer.c

ARM: OMAP: dmtimer: Include linux/module.h

2011-11-04 17:41:06 -07:00

fb.c

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

2010-10-26 10:02:39 -07:00

fb.h

OMAP: plat-omap: Fix static function warnings

2010-10-08 10:12:38 -07:00

i2c.c

ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success

2011-11-04 17:41:07 -07:00

io.c

Merge branch 'depends/rmk/memory_h' into next/cleanup2

2011-11-01 13:47:27 +01:00

Kconfig

ARM: GIC: Make MULTI_IRQ_HANDLER mandatory

2011-11-15 18:14:02 +00:00

mailbox.c

arm: fix implicit module.h users by adding it to arch/arm as required.

2011-10-31 19:30:50 -04:00

Makefile

omap: iommu/iovmm: move to dedicated iommu folder

2011-08-26 11:46:00 +02:00

mcbsp.c

ARM: OMAP: mcbsp: Start generalize signal muxing functions

2011-09-26 17:49:07 -07:00

mux.c

omap: mux: Remove old mux code

2010-07-05 16:31:40 +03:00

ocpi.c

…

omap_device.c

Merge branch 'fixes-modulesplit' into fixes

2011-11-07 12:27:23 -08:00

omap-pm-noop.c

ARM: OMAP: change get_context_loss_count ret value to int

2011-11-04 17:41:07 -07:00

sram.c

ARM: OMAP: Map SRAM later on with ioremap_exec()

2011-10-19 16:34:10 -07:00

sram.h

OMAP: plat-omap: Fix static function warnings

2010-10-08 10:12:38 -07:00

usb.c

omap: Move omap1 USB platform init code into mach-omap1/usb.c

2010-07-05 16:31:30 +03:00