Arnd Bergmann 38abdcd0d0 Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2 ...

Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

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

2012-03-15 21:05:52 +00:00

..

arm_timer.h

ARM: Improve documentation in arm_timer.h

2010-04-29 18:04:15 +01: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

…

clps7111.h

…

coresight.h

ARM: 6293/1: coresight: cosmetic fixes

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

cs89712.h

…

debug-8250.S

…

debug-pl01x.S

…

dec21285.h

…

entry-macro-iomd.S

ARM: remove disable_fiq and arch_ret_to_user macros

2012-02-21 17:05:18 -06:00

ep7211.h

…

ep7212.h

…

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

…

iomd.h

…

iop3xx-adma.h

…

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

…

it8152.h

ARM: pxa: use correct __iomem annotations

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

linkup-l1110.h

…

locomo.h

…

memc.h

…

pci_v3.h

…

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

…

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

…

timer-sp.h

clockevents: ARM sp804: allow clockevent name to be specified

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

uengine.h

…

vic.h

ARM: vic: MULTI_IRQ_HANDLER handler

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