Arnd Bergmann 4788d72ce6 Merge branch 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers ... * 'next/soc-exynos5250-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (201 commits) gpio/samsung: use ioremap() for EXYNOS4 GPIOlib gpio/samsung: add support GPIOlib for EXYNOS5250 ARM: EXYNOS: add support GPIO for EXYNOS5250 (update to v3.3-rc7) Conflicts: arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The dummy clock for the pxa rtc in those files keeps getting added and removed in various trees. Apparently removing is the correct solution. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-15 20:50:16 +00:00
..
include/mach	Merge branch 'amba' into for-armsoc	2012-01-26 19:59:44 +00:00
core.h	ARM: amba: vexpress: get rid of private platform amba_device initializer	2012-01-25 11:04:03 +00:00
ct-ca9x4.c	Linux 3.3-rc2	2012-02-07 15:05:20 -08:00
hotplug.c	ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP	2012-01-23 10:20:05 +00:00
Kconfig	ARM: 7346/1: errata: fix PL310 erratum #753970 workaround selection	2012-02-27 11:22:38 +00:00
Makefile	ARM: realview/vexpress: consolidate SMP bringup code	2011-02-19 11:11:41 +00:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
platsmp.c	ARM: versatile: Add missing ENDPROC to headsmp.S	2012-01-16 08:35:25 -06:00
v2m.c	ARM: amba: vexpress: get rid of private platform amba_device initializer	2012-01-25 11:04:03 +00:00