2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
linux-next/arch/arm/mach-orion5x
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
addr-map.c Fix common misspellings 2011-03-31 11:26:23 -03:00
common.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
common.h ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
d2net-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
db88f5281-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
dns323-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
edmini_v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
irq.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
kurobox_pro-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ls_hgl-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ls-chl-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
lsmini-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
Makefile [ARM] Orion: added Buffalo LS-CHL support 2010-12-07 13:50:04 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mpp.c ARM: orion5x: fixup 5181 MPP mask check 2011-07-18 16:17:41 -04:00
mpp.h ARM: orion5x: Refactor mpp code to use common orion platform mpp. 2011-05-16 15:42:59 -04:00
mss2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
mv2120-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
net2big-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
pci.c ARM: mach-orion5x: add missing header file <linux/vga.h> 2011-08-25 09:08:18 -05:00
rd88f5181l-fxo-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f5181l-ge-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f5182-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
rd88f6183ap-ge-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
terastation_pro2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts78xx-fpga.h ARM: orion5x: use safer FPGA ID 'default' for TS-78xx 2011-03-05 14:31:53 -05:00
ts78xx-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts209-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
ts409-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
tsx09-common.c Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2008-10-11 10:09:45 -07:00
tsx09-common.h [ARM] Orion: remove code duplication in TS209 and TS409 setup files 2008-06-22 22:44:54 +02:00
wnr854t-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00
wrt350n-v2-setup.c ARM: restart: orion5x: use new restart hook 2012-01-05 12:57:16 +00:00