Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup ... Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9260.c arch/arm/mach-at91/at91sam9261.c arch/arm/mach-at91/at91sam9263.c arch/arm/mach-at91/at91sam9g45.c arch/arm/mach-at91/at91sam9rl.c arch/arm/mach-exynos/cpu.c arch/arm/mach-shmobile/board-kota2.c This resolves a bunch of conflicts between the arm-soc tree and changes from the arm tree that have gone upstream. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 11:51:28 +00:00
..
include/mach	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00
clock.c
clock.h	ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors	2011-06-09 10:15:06 +01:00
core.c	ARM: restart: lpc32xx & u300: remove unnecessary printk	2012-01-05 12:57:21 +00:00
dummyspichip.c
i2c.c	mfd: Delete ab3550 driver	2011-10-24 14:09:16 +02:00
i2c.h
Kconfig	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
Makefile	pinctrl: add a driver for the U300 pinmux	2011-10-13 12:57:45 +02:00
Makefile.boot	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
mmc.c	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
mmc.h
regulator.c
spi.c	pinctrl: add a driver for the U300 pinmux	2011-10-13 12:57:45 +02:00
spi.h
timer.c	mach-u300: cleanup clockevent code	2011-06-23 12:09:42 +02:00
u300.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00