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
..
include/mach	Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc	2012-02-22 22:04:41 +00:00
addr-map.c	ARM: Orion: mbus_dram_info consolidation	2011-12-13 18:46:55 -05:00
buffalo-wxl-setup.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00
common.c	ARM: orion: Fix USB phy for orion5x.	2012-02-09 16:16:35 -08:00
common.h	New feature development	2012-01-09 14:38:51 -08:00
db78x00-bp-setup.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00
irq.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
Kconfig	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile	[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)	2010-02-23 17:10:08 -05:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mpp.c	ARM: Orion: Get address map from plat-orion instead of via platform_data	2011-12-13 18:46:55 -05:00
mpp.h	ARM: orion: Fix Orion5x GPIO regression from MPP cleanup	2012-02-09 16:16:31 -08:00
pcie.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
rd78x00-masa-setup.c	ARM: restart: mv78xx0: use new restart hook	2012-01-05 12:57:15 +00:00