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

..

aemif.h

davinci: add support for aemif timing configuration

2010-09-24 07:40:26 -07:00

asp.h

ASoC: davinci: let platform data define edma queue numbers

2010-07-20 09:57:20 +01:00

cdce949.h

davinci: add support for CDCE949 clock synthesizer

2010-02-04 13:29:58 -08:00

clock.h

davinci: major rework of clock, PLL, PSC infrastructure

2009-04-23 09:31:00 -07:00

common.h

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

cp_intc.h

Davinci: aintc/cpintc - use ioremap()

2010-05-13 10:05:28 -07:00

cpufreq.h

davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator

2009-11-25 10:21:37 -08:00

cpuidle.h

davinci: cpuidle: move mapping of DDR2 controller registers out of driver

2010-02-04 13:29:38 -08:00

cputype.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

da8xx.h

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

ddr2.h

ARM: mach-davinci: remove mach/memory.h

2011-10-13 12:49:47 -04:00

debug-macro.S

ARM: mach-davinci: clean up debug-macro.S

2011-09-26 10:11:28 -04:00

dm355.h

DaVinci: move AEMIF #define's to the proper headers

2010-05-06 15:02:06 -07:00

dm365.h

davinci: cleanup mdio arch code and switch to phy_id

2010-09-24 07:40:30 -07:00

dm644x.h

davinci: cleanup mdio arch code and switch to phy_id

2010-09-24 07:40:30 -07:00

dm646x.h

ARM: davinci: vpif: move code to driver core header from platform

2011-12-03 00:33:50 +05:30

edma.h

davinci: remove unused DA830_edma_ch enum

2011-03-11 10:48:28 -08:00

entry-macro.S

ARM: entry: remove unused irq_prio_table macro

2011-06-28 10:34:58 +01:00

gpio-davinci.h

ARM: 7040/1: mach-davinci: break out GPIO driver specifics

2011-08-22 09:12:56 +01:00

gpio.h

ARM: 7142/1: davinci: mark GPIO implementation complex

2011-11-05 19:09:47 +00:00

hardware.h

davinci: move DM64XX_VDD3P3V_PWDN to devices.c

2011-05-23 22:18:26 +05:30

i2c.h

Merge branch 'for-next' into for-linus

2010-03-08 16:55:37 +01:00

io.h

ARM: mach-davinci: remove arch specific special handling for ioremap

2011-11-15 22:30:39 -05:00

irqs.h

Davinci: tnetv107x IRQ definitions

2010-05-06 15:02:05 -07:00

keyscan.h

Input: davinci_keyscan - add device_enable method to platform data

2010-01-06 00:17:11 -08:00

mmc.h

mmc: davinci: Add support for set_power callback

2011-09-17 15:53:23 +05:30

mux.h

ARM: davinci: DA850: Add GPIO pinmux configuration for wl1271

2011-09-17 15:53:22 +05:30

nand.h

mtd: nand: rename NAND_USE_FLASH_BBT

2011-09-11 15:01:56 +03:00

pm.h

davinci: add power management support

2010-02-04 13:29:55 -08:00

psc.h

ARM: davinci: psc: fix incorrect offsets

2011-12-05 16:47:15 +05:30

serial.h

ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset

2011-09-26 10:11:27 -04:00

spi.h

davinci: spi: move event queue parameter to platform data

2011-02-28 14:53:29 -08:00

sram.h

davinci: add SRAM allocator

2009-05-28 15:18:13 -07:00

system.h

ARM: restart: remove the now empty arch_reset()

2012-01-05 12:57:22 +00:00

time.h

davinci: Add watchdog base address flexibility

2009-05-26 08:20:31 -07:00

timex.h

davinci: explain CLOCK_TICK_RATE of 27MHz in include/mach/timex.h

2010-02-04 13:29:41 -08:00

tnetv107x.h

ARM: 7190/1: restart: davinci: use new restart hook

2012-01-05 12:57:09 +00:00

uncompress.h

ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset

2011-09-26 10:11:27 -04:00

usb.h

DaVinci: rename setup_usb() to davinci_setup_usb()

2009-11-25 10:21:33 -08:00