Arnd Bergmann b2f1df8d2f Merge branch 'renesas/timer' into next/timer ...

Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-03-20 09:41:43 +00:00

..

arm_timer.h

ARM: vexpress: Get rid of MMIO_P2V

2012-02-23 15:09:42 +00:00

cache-l2x0.h

ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OF

2011-11-12 11:32:34 +00:00

cache-tauros2.h

ARM: Add Tauros2 L2 cache controller support

2009-11-27 15:43:21 -05:00

clps7111.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

coresight.h

ARM: 6293/1: coresight: cosmetic fixes

2010-10-04 20:20:44 +01:00

cs89712.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

debug-8250.S

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

debug-pl01x.S

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

dec21285.h

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

entry-macro-iomd.S

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ep7211.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

ep7212.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

gic.h

ARM: GIC: Make MULTI_IRQ_HANDLER mandatory

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

icst.h

Update broken web addresses in arch directory.

2010-10-18 11:03:21 +02:00

ioc.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

iomd.h

[ARM] clps7500: remove support

2008-11-27 12:38:11 +00:00

iop3xx-adma.h

iop-adma: redundant/wrong tests in iop_*_count()?

2010-02-28 22:22:12 -07:00

iop3xx-gpio.h

ARM: gpio: make trivial GPIOLIB implementation the default

2011-08-12 08:54:19 +01:00

iop3xx.h

ARM: restart: iop3xx: use new restart hook

2012-01-05 12:57:13 +00:00

iop_adma.h

Merge branch 'dmaengine' into async-tx-next

2009-09-08 17:55:21 -07:00

it8152.h

ARM: pxa: use correct __iomem annotations

2011-10-08 21:03:07 +08:00

linkup-l1110.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

locomo.h

[ARM] locomo: allow cascaded IRQ base to be specified by platforms

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

memc.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pci_v3.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

pl080.h

ARM: asm/pl080.h: Protect against multiple inclusion of header file

2011-08-25 19:33:37 +05:30

pl330.h

ARM: 7164/3: PL330: Fix the size of the dst_cache_ctrl field

2012-02-15 21:10:49 +00:00

sa1111.h

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

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

scoop.h

ARM: scoop: drop pcmcia_init callback

2011-07-11 14:43:32 +08:00

sp810.h

ARM: 6722/1: SPEAr: sp810: switch to slow mode before reset

2011-02-21 19:29:24 +00:00

ssp.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

timer-sp.h

clockevents: ARM sp804: allow clockevent name to be specified

2011-05-23 18:04:53 +01:00

uengine.h

[ARM] move include/asm-arm to arch/arm/include/asm

2008-08-02 21:32:35 +01:00

vic.h

ARM: vic: MULTI_IRQ_HANDLER handler

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