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
..
db5500-regs.h	ARM: ux500: update register files	2011-12-19 00:35:07 +01:00
db8500-regs.h	ARM: ux500: export System-on-Chip information ux500 via sysfs	2012-02-13 06:31:38 +00:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
devices.h	ARM: ux500: remove support for early silicon revisions	2011-12-19 00:35:07 +01:00
gpio.h	ARM: 7241/1: mach-ux500 Use CONFIG_ARCH_NR_GPIO	2011-12-23 22:54:51 +00:00
hardware.h	ARM: ux500: update ASIC detection for U5500	2011-12-19 00:35:06 +01:00
id.h	ARM: ux500: update ASIC detection for U5500	2011-12-19 00:35:06 +01:00
io.h
irqs-board-mop500.h	mfd: Unify abx500 headers in mfd/abx500	2012-01-09 00:37:39 +01:00
irqs-board-u5500.h	mach-ux500: update SoC and board IRQ handling	2011-05-24 22:11:45 +02:00
irqs-db5500.h	mach-ux500: update SoC and board IRQ handling	2011-05-24 22:11:45 +02:00
irqs-db8500.h	mach-ux500: update SoC and board IRQ handling	2011-05-24 22:11:45 +02:00
irqs.h	mach-ux500: update SoC and board IRQ handling	2011-05-24 22:11:45 +02:00
mbox-db5500.h	ux500: rename modem IRQ and MBOX files	2010-12-22 09:26:49 +01:00
setup.h	ARM: ux500: export System-on-Chip information ux500 via sysfs	2012-02-13 06:31:38 +00:00
timex.h	ARM: 5831/1: ARM: U8500 core machine support	2009-11-28 10:22:52 +00:00
uncompress.h	mach-ux500: remove most of the ugly machine_is_*() calls	2011-08-30 09:22:57 +02:00
usb.h	ARM: ux500: pass parent pointer to each platform device	2012-02-13 06:31:29 +00:00