korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-18 08:35:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
40ba95fdf1
linux/arch/arm/mach-davinci
History
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
aemif.c davinci: aemif: signedness bug in davinci_aemif_setup_timing() 2010-12-10 07:33:51 -08:00
board-da830-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-da850-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm355-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm355-leopard.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm365-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm644x-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm646x-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-mityomapl138.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-neuros-osd2.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-omapl138-hawk.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-sffsdr.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-tnetv107x-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
clock.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
common.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
cp_intc.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
cpufreq.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2011-11-07 10:13:52 -08:00
da830.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
da850.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
devices-da8xx.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
devices-tnetv107x.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm355.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm365.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm644x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm646x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dma.c ARM: davinci: edma: use kzalloc() 2011-09-17 15:54:09 +05:30
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: davinci: AM18x: Add wl1271/wlan support 2011-09-17 15:53:23 +05:30
Makefile ARM: mach-davinci: remove arch specific special handling for ioremap 2011-11-15 22:30:39 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
psc.c ARM: davinci: psc: fix incorrect offsets 2011-12-05 16:47:15 +05:30
serial.c Davinci: serial - conditional reset via pwremu 2010-05-06 15:02:10 -07:00
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
tnetv107x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
usb.c DA8xx: assign name to MUSB IRQ resource 2010-12-11 12:15:53 +02:00