Merge branch 'next/soc' into next/dt

Browse source

...

This commit is contained in:

Olof Johansson 2013-02-05 13:19:03 -08:00

parent f015941f6b f7c66dc0bf

commit 0b6ad80abb

215 changed files with 11353 additions and 10817 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

Documentation/devicetree/bindings/arm/sirf.txt

View file

8

Documentation/devicetree/bindings/arm/vt8500.txt

View file

91

Documentation/devicetree/bindings/clock/imx31-clock.txt

View file

205

Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt

View file

262

Documentation/devicetree/bindings/clock/nvidia,tegra30-car.txt

View file

3

Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt

View file

17

Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt

View file

18

arch/arm/Kconfig

View file

32

arch/arm/Kconfig.debug

View file

8

arch/arm/boot/dts/Makefile

View file

2

arch/arm/boot/dts/dove.dtsi

View file

7

arch/arm/boot/dts/emev2.dtsi

View file

17

arch/arm/boot/dts/imx31.dtsi

View file

54

arch/arm/boot/dts/marco-evb.dts

View file

756

arch/arm/boot/dts/marco.dtsi

View file

24

arch/arm/boot/dts/sh73a0-reference.dtsi

View file

100

arch/arm/boot/dts/sh73a0.dtsi

View file

21

arch/arm/boot/dts/tegra114-dalmore.dts

View file

21

arch/arm/boot/dts/tegra114-pluto.dts

View file

153

arch/arm/boot/dts/tegra114.dtsi

View file

4

arch/arm/boot/dts/tegra20-harmony.dts

View file

6

arch/arm/boot/dts/tegra20-paz00.dts

View file

4

arch/arm/boot/dts/tegra20-seaboard.dts

View file

4

arch/arm/boot/dts/tegra20-trimslice.dts

View file

4

arch/arm/boot/dts/tegra20-ventana.dts

View file

96

arch/arm/boot/dts/tegra20.dtsi

View file

91

arch/arm/boot/dts/tegra30.dtsi

View file

47

arch/arm/boot/dts/wm8850-w70v2.dts

View file

224

arch/arm/boot/dts/wm8850.dtsi

View file

2

arch/arm/configs/imx_v6_v7_defconfig

View file

1

arch/arm/configs/kirkwood_defconfig

View file

2

arch/arm/configs/mvebu_defconfig

View file

3

arch/arm/configs/prima2_defconfig

View file

33

arch/arm/include/asm/cputype.h

View file

17

arch/arm/include/asm/smp_scu.h

View file

2

arch/arm/include/debug/imx.S

View file

24

arch/arm/mach-vt8500/include/mach/debug-macro.S → arch/arm/include/debug/vt8500.S

View file

16

arch/arm/kernel/perf_event.c

View file

51

arch/arm/kernel/perf_event_cpu.c

View file

4

arch/arm/kernel/perf_event_v6.c

View file

18

arch/arm/kernel/perf_event_v7.c

View file

2

arch/arm/kernel/perf_event_xscale.c

View file

28

arch/arm/mach-bcm2835/bcm2835.c

View file

9

arch/arm/mach-davinci/board-da830-evm.c

View file

9

arch/arm/mach-davinci/board-da850-evm.c

View file

9

arch/arm/mach-davinci/board-mityomapl138.c

View file

39

arch/arm/mach-davinci/clock.c

View file

3

arch/arm/mach-davinci/clock.h

View file

17

arch/arm/mach-davinci/da850.c

View file

16

arch/arm/mach-davinci/devices-da8xx.c

View file

3

arch/arm/mach-davinci/include/mach/clock.h

View file

4

arch/arm/mach-davinci/include/mach/da8xx.h

View file

3

arch/arm/mach-davinci/include/mach/psc.h

View file

29

arch/arm/mach-davinci/psc.c

View file

36

arch/arm/mach-imx/Kconfig

View file

9

arch/arm/mach-imx/Makefile

View file

4

arch/arm/mach-imx/Makefile.boot

View file

7

arch/arm/mach-imx/clk-imx27.c

View file

15

arch/arm/mach-imx/clk-imx31.c

View file

4

arch/arm/mach-imx/clk-imx35.c

View file

12

arch/arm/mach-imx/clk-imx6q.c

View file

14

arch/arm/mach-imx/common.h

View file

39

arch/arm/mach-imx/cpu-imx5.c

View file

95

arch/arm/mach-imx/cpuidle-imx6q.c

View file

5

arch/arm/mach-imx/cpuidle.h

View file

33

arch/arm/mach-imx/devices-imx50.h

View file

2

arch/arm/mach-imx/devices/Kconfig

View file

6

arch/arm/mach-imx/devices/platform-fec.c

View file

10

arch/arm/mach-imx/devices/platform-imx-i2c.c

View file

12

arch/arm/mach-imx/devices/platform-imx-uart.c

View file

5

arch/arm/mach-imx/gpc.c

View file

6

arch/arm/mach-imx/hardware.h

View file

17

arch/arm/mach-imx/imx31-dt.c

View file

977

arch/arm/mach-imx/iomux-mx50.h

View file

47

arch/arm/mach-imx/lluart.c

View file

21

arch/arm/mach-imx/mach-imx6q.c

View file

221

arch/arm/mach-imx/mach-mx50_rdp.c

View file

174

arch/arm/mach-imx/mach-mx51_3ds.c

View file

48

arch/arm/mach-imx/mm-imx5.c

View file

290

arch/arm/mach-imx/mx50.h

View file

13

arch/arm/mach-imx/mxc.h

View file

10

arch/arm/mach-imx/platsmp.c

View file

7

arch/arm/mach-imx/pm-imx5.c

View file

3

arch/arm/mach-imx/time.c

View file

1

arch/arm/mach-kirkwood/Makefile

View file

2

arch/arm/mach-kirkwood/board-dt.c

View file

23

arch/arm/mach-kirkwood/common.c

View file

1

arch/arm/mach-kirkwood/common.h

View file

3

arch/arm/mach-kirkwood/include/mach/kirkwood.h

View file

10

arch/arm/mach-kirkwood/pcie.c

View file

2

arch/arm/mach-omap2/omap-smp.c

View file

1

arch/arm/mach-omap2/omap44xx.h

View file

10

arch/arm/mach-prima2/Kconfig

View file

5

arch/arm/mach-prima2/Makefile

View file

33

arch/arm/mach-prima2/common.c

View file

15

arch/arm/mach-prima2/common.h

View file

79

arch/arm/mach-prima2/headsmp.S

View file

41

arch/arm/mach-prima2/hotplug.c

View file

4

arch/arm/mach-prima2/include/mach/irqs.h

View file

6

arch/arm/mach-prima2/include/mach/uart.h

View file

Some files were not shown because too many files have changed in this diff Show more