Arnd Bergmann a65b5f4ccd Merge branch 'cleanup/kconfig' into next/drivers ...

This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

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

2014-03-18 16:25:47 +01:00

..

board-dt.c

ARM: sti: remove custom .init_time hook

2013-09-29 21:09:43 +02:00

headsmp.S

ARM: STi: remove sti_secondary_start from INIT section.

2013-08-04 13:40:55 -07:00

Kconfig

Merge branch 'cleanup/kconfig' into next/drivers

2014-03-18 16:25:47 +01:00

Makefile

ARM: sti: Add STiH415 SOC support

2013-06-25 13:26:47 -07:00

platsmp.c

ARM: clean up cache handling in platform code

2013-12-11 16:24:34 -08:00

smp.h

ARM: sti: Add STiH415 SOC support

2013-06-25 13:26:47 -07:00