kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge branch 'dt2' into cleanup3-base

Browse source 
Conflicts:
	arch/arm/mach-shmobile/Makefile.boot
This commit is contained in:
Simon Horman 2013-08-06 18:06:53 +09:00
commit 4e0f3fcfe2
34 changed files with 461 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/Makefile
View file

6
arch/arm/boot/dts/emev2.dtsi
View file

65
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
View file

2
arch/arm/boot/dts/r8a73a4-ape6evm.dts
View file

12
arch/arm/boot/dts/r8a7740.dtsi
View file

32
arch/arm/boot/dts/r8a7778-bockw-reference.dts
View file

2
arch/arm/boot/dts/r8a7778-bockw.dts
View file

2
arch/arm/boot/dts/r8a7779-marzen-reference.dts
View file

27
arch/arm/boot/dts/r8a7779-marzen.dts
View file

45
arch/arm/boot/dts/r8a7790-lager-reference.dts
View file

2
arch/arm/boot/dts/r8a7790-lager.dts
View file

2
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
View file

2
arch/arm/boot/dts/sh73a0-kzm9g.dts
View file

6
arch/arm/boot/dts/sh73a0.dtsi
View file

37
arch/arm/mach-shmobile/Kconfig
View file

3
arch/arm/mach-shmobile/Makefile
View file

3
arch/arm/mach-shmobile/Makefile.boot
View file

64
arch/arm/mach-shmobile/board-ape6evm-reference.c
View file

2
arch/arm/mach-shmobile/board-armadillo800eva.c
View file

62
arch/arm/mach-shmobile/board-bockw-reference.c
View file

45
arch/arm/mach-shmobile/board-lager-reference.c
View file

11
arch/arm/mach-shmobile/board-marzen.c
View file

1
arch/arm/mach-shmobile/include/mach/r8a73a4.h
View file

1
arch/arm/mach-shmobile/include/mach/r8a7740.h
View file

1
arch/arm/mach-shmobile/include/mach/r8a7778.h
View file

1
arch/arm/mach-shmobile/include/mach/r8a7779.h
View file

1
arch/arm/mach-shmobile/include/mach/r8a7790.h
View file

20
arch/arm/mach-shmobile/intc-r8a7740.c
View file

22
arch/arm/mach-shmobile/intc-r8a7779.c
View file

9
arch/arm/mach-shmobile/setup-r8a73a4.c
View file

7
arch/arm/mach-shmobile/setup-r8a7778.c
View file

9
arch/arm/mach-shmobile/setup-r8a7790.c
View file

12
arch/arm/mach-shmobile/smp-r8a7779.c
View file

11
arch/arm/mach-shmobile/smp-sh73a0.c
View file