Russell King ac1d426e82 Merge branch 'devel-stable' into devel ...

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig

2010-05-17 17:24:04 +01:00

..

clkdev.c

Merge branch 'devel-stable' into devel

2010-05-17 17:24:04 +01:00

dmabounce.c

Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel

2010-02-25 22:06:43 +00:00

gic.c

[ARM] 5556/1: Fix the irq_desc.cpu references

2009-06-19 15:11:16 +01:00

icst.c

ARM: ICST: kill duplicate icst code

2010-05-02 09:35:33 +01:00

it8152.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kconfig

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

2010-05-17 11:53:39 +01:00

locomo.c

[ARM] locomo: fix unpaired spin_lock_irqsave

2010-03-22 12:03:09 +08:00

Makefile

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

2010-05-17 11:53:39 +01:00

pl330.c

ARM: 6132/1: PL330: Add common core driver

2010-05-15 15:03:50 +01:00

sa1111.c

[ARM] sa1111: allow cascaded IRQs to be used by platforms

2010-03-02 07:40:51 +08:00

scoop.c

[ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set.

2010-03-02 07:40:52 +08:00

sharpsl_param.c

[ARM] 4733/1: export sharpsl_param

2008-10-03 10:18:35 +01:00

time-acorn.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

uengine.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

via82c505.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

vic.c

ARM: 6025/1: vic: factor out common init code

2010-04-14 11:19:23 +01:00