Merge branch 'omap/dt' into next/drivers

Browse source

Needed for the omap timer changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

...

This commit is contained in:

Arnd Bergmann 2012-11-15 17:41:21 +01:00

parent b770ea523d d308ba50a1

commit 8dbd2879e3

679 changed files with 10685 additions and 6334 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

4

Documentation/00-INDEX

View file

2

Documentation/devicetree/bindings/arm/atmel-at91.txt

View file

15

Documentation/devicetree/bindings/arm/omap/counter.txt

View file

31

Documentation/devicetree/bindings/arm/omap/timer.txt

View file

18

Documentation/devicetree/bindings/bus/omap-ocp2scp.txt

View file

2

Documentation/devicetree/bindings/i2c/trivial-devices.txt

View file

19

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

View file

2

Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt

View file

2

Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt

View file

21

Documentation/devicetree/bindings/usb/am33xx-usb.txt

View file

24

Documentation/firmware_class/README

View file

2

Documentation/hwmon/fam15h_power

View file

39

Documentation/zh_CN/IRQ.txt

View file

156

Documentation/zh_CN/arm64/booting.txt

View file

93

Documentation/zh_CN/arm64/memory.txt

View file

21

MAINTAINERS

View file

2

Makefile

View file

80

arch/alpha/include/asm/thread_info.h

View file

25

arch/alpha/kernel/osf_sys.c

View file

2

arch/alpha/kernel/process.c

View file

6

arch/alpha/kernel/traps.c

View file

9

arch/arm/Kconfig

View file

13

arch/arm/Makefile

View file

10

arch/arm/boot/Makefile

View file

6

arch/arm/boot/dts/Makefile

View file

50

arch/arm/boot/dts/am335x-bone.dts

View file

118

arch/arm/boot/dts/am335x-evm.dts

View file

250

arch/arm/boot/dts/am335x-evmsk.dts

View file

156

arch/arm/boot/dts/am33xx.dtsi

View file

4

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

View file

17

arch/arm/boot/dts/dbx5x0.dtsi

View file

6

arch/arm/boot/dts/exynos4210-trats.dts

View file

1

arch/arm/boot/dts/imx23.dtsi

View file

1

arch/arm/boot/dts/imx28.dtsi

View file

86

arch/arm/boot/dts/omap2.dtsi

View file

16

arch/arm/boot/dts/omap2420.dtsi

View file

19

arch/arm/boot/dts/omap2430.dtsi

View file

6

arch/arm/boot/dts/omap3-beagle-xm.dts

View file

67

arch/arm/boot/dts/omap3-beagle.dts

View file

111

arch/arm/boot/dts/omap3.dtsi

View file

17

arch/arm/boot/dts/omap4-panda-a4.dts

View file

9

arch/arm/boot/dts/omap4-pandaES.dts → arch/arm/boot/dts/omap4-panda-es.dts

View file

22

arch/arm/boot/dts/omap4-panda.dts

View file

17

arch/arm/boot/dts/omap4-sdp-es23plus.dts

View file

22

arch/arm/boot/dts/omap4-sdp.dts

View file

0

arch/arm/boot/dts/omap4-var_som.dts → arch/arm/boot/dts/omap4-var-som.dts

View file

105

arch/arm/boot/dts/omap4.dtsi

View file

13

arch/arm/boot/dts/omap5-evm.dts

View file

178

arch/arm/boot/dts/omap5.dtsi

View file

67

arch/arm/boot/dts/samsung_k3pe0e000b.dtsi

View file

27

arch/arm/boot/dts/twl4030.dtsi

View file

5

arch/arm/boot/dts/twl6030.dtsi

View file

2

arch/arm/configs/imx_v6_v7_defconfig

View file

10

arch/arm/configs/mvebu_defconfig

View file

1

arch/arm/configs/versatile_defconfig

View file

2

arch/arm/include/asm/flat.h

View file

4

arch/arm/include/asm/uaccess.h

View file

12

arch/arm/include/asm/xen/interface.h

View file

13

arch/arm/include/asm/xen/page.h

View file

27

arch/arm/include/debug/8250_32.S

View file

18

arch/arm/include/debug/picoxcell.S

View file

5

arch/arm/include/debug/socfpga.S

View file

2

arch/arm/kernel/irq.c

View file

4

arch/arm/kernel/kprobes-test-arm.c

View file

7

arch/arm/kernel/machine_kexec.c

View file

4

arch/arm/kernel/perf_event.c

View file

14

arch/arm/kernel/smp.c

View file

4

arch/arm/kernel/smp_twd.c

View file

1

arch/arm/lib/delay.c

View file

10

arch/arm/mach-at91/Kconfig

View file

2

arch/arm/mach-at91/at91rm9200.c

View file

4

arch/arm/mach-at91/at91rm9200_devices.c

View file

4

arch/arm/mach-at91/at91sam9260.c

View file

4

arch/arm/mach-at91/at91sam9260_devices.c

View file

4

arch/arm/mach-at91/at91sam9261.c

View file

4

arch/arm/mach-at91/at91sam9261_devices.c

View file

2

arch/arm/mach-at91/at91sam9263.c

View file

4

arch/arm/mach-at91/at91sam9263_devices.c

View file

4

arch/arm/mach-at91/at91sam9rl_devices.c

View file

2

arch/arm/mach-at91/at91x40.c

View file

2

arch/arm/mach-at91/board-neocore926.c

View file

2

arch/arm/mach-at91/board-sam9261ek.c

View file

2

arch/arm/mach-at91/board-sam9263ek.c

View file

3

arch/arm/mach-at91/generic.h

View file

9

arch/arm/mach-at91/irq.c

View file

4

arch/arm/mach-at91/setup.c

View file

5

arch/arm/mach-exynos/common.c

View file

1

arch/arm/mach-exynos/mach-exynos4-dt.c

View file

2

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

View file

4

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

View file

4

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

View file

5

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

View file

1

arch/arm/mach-omap2/Kconfig

View file

17

arch/arm/mach-omap2/board-generic.c

View file

22

arch/arm/mach-omap2/board-omap3beagle.c

View file

2

arch/arm/mach-omap2/clock33xx_data.c

View file

8

arch/arm/mach-omap2/mux34xx.c

View file

1

arch/arm/mach-omap2/pm.h

View file

30

arch/arm/mach-omap2/pm34xx.c

View file

5

arch/arm/mach-omap2/serial.c

View file

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