Merge branch 'devel-stable' into for-next

Browse source

...

This commit is contained in:

Russell King 2015-04-14 22:28:32 +01:00

parent c848791f03 9fd85eb502

commit 4b2f883847

723 changed files with 9016 additions and 4904 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

27

Documentation/CodeOfConflict

View file

4

Documentation/cgroups/unified-hierarchy.txt

View file

2

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

View file

2

Documentation/devicetree/bindings/arm/pmu.txt

View file

4

Documentation/devicetree/bindings/arm/sti.txt

View file

1

Documentation/devicetree/bindings/i2c/i2c-imx.txt

View file

4

Documentation/devicetree/bindings/net/amd-xgbe-phy.txt

View file

5

Documentation/devicetree/bindings/net/apm-xgene-enet.txt

View file

29

Documentation/devicetree/bindings/power/power_domain.txt

View file

0

Documentation/devicetree/bindings/serial/of-serial.txt → Documentation/devicetree/bindings/serial/8250.txt

View file

19

Documentation/devicetree/bindings/serial/axis,etraxfs-uart.txt

View file

16

Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt

View file

3

Documentation/devicetree/bindings/submitting-patches.txt

View file

2

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

5

Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

View file

4

Documentation/filesystems/dlmfs.txt

View file

4

Documentation/filesystems/ocfs2.txt

View file

22

Documentation/power/suspend-and-interrupts.txt

View file

30

MAINTAINERS

View file

2

Makefile

View file

14

arch/arc/include/asm/processor.h

View file

37

arch/arc/include/asm/stacktrace.h

View file

23

arch/arc/kernel/process.c

View file

21

arch/arc/kernel/stacktrace.c

View file

2

arch/arc/kernel/unaligned.c

View file

12

arch/arc/mm/fault.c

View file

1

arch/arm/Makefile

View file

9

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

View file

8

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

View file

4

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

View file

6

arch/arm/boot/dts/am33xx-clocks.dtsi

View file

25

arch/arm/boot/dts/am437x-idk-evm.dts

View file

12

arch/arm/boot/dts/am43xx-clocks.dtsi

View file

8

arch/arm/boot/dts/am57xx-beagle-x15.dts

View file

7

arch/arm/boot/dts/at91sam9260.dtsi

View file

9

arch/arm/boot/dts/at91sam9261.dtsi

View file

5

arch/arm/boot/dts/at91sam9263.dtsi

View file

3

arch/arm/boot/dts/at91sam9g45.dtsi

View file

1

arch/arm/boot/dts/at91sam9n12.dtsi

View file

5

arch/arm/boot/dts/at91sam9x5.dtsi

View file

25

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

View file

34

arch/arm/boot/dts/dm816x.dtsi

View file

18

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

View file

8

arch/arm/boot/dts/dra7.dtsi

View file

18

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

View file

90

arch/arm/boot/dts/dra7xx-clocks.dtsi

View file

2

arch/arm/boot/dts/exynos3250.dtsi

View file

52

arch/arm/boot/dts/exynos4-cpu-thermal.dtsi

View file

45

arch/arm/boot/dts/exynos4.dtsi

View file

19

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

View file

57

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

View file

38

arch/arm/boot/dts/exynos4210.dtsi

View file

5

arch/arm/boot/dts/exynos4212.dtsi

View file

64

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

View file

24

arch/arm/boot/dts/exynos4412-tmu-sensor-conf.dtsi

View file

15

arch/arm/boot/dts/exynos4412-trats2.dts

View file

5

arch/arm/boot/dts/exynos4412.dtsi

View file

12

arch/arm/boot/dts/exynos4x12.dtsi

View file

44

arch/arm/boot/dts/exynos5250.dtsi

View file

35

arch/arm/boot/dts/exynos5420-trip-points.dtsi

View file

33

arch/arm/boot/dts/exynos5420.dtsi

View file

24

arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi

View file

25

arch/arm/boot/dts/exynos5440-trip-points.dtsi

View file

18

arch/arm/boot/dts/exynos5440.dtsi

View file

2

arch/arm/boot/dts/imx6qdl-sabresd.dtsi

View file

2

arch/arm/boot/dts/imx6sl-evk.dts

View file

4

arch/arm/boot/dts/omap2.dtsi

View file

9

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

View file

4

arch/arm/boot/dts/omap3.dtsi

View file

4

arch/arm/boot/dts/omap4.dtsi

View file

2

arch/arm/boot/dts/omap5-core-thermal.dtsi

View file

2

arch/arm/boot/dts/omap5-gpu-thermal.dtsi

View file

12

arch/arm/boot/dts/omap5.dtsi

View file

41

arch/arm/boot/dts/omap54xx-clocks.dtsi

View file

3

arch/arm/boot/dts/sama5d3.dtsi

View file

9

arch/arm/boot/dts/sama5d4.dtsi

View file

6

arch/arm/boot/dts/socfpga.dtsi

View file

1

arch/arm/configs/at91_dt_defconfig

View file

84

arch/arm/configs/multi_v7_defconfig

View file

5

arch/arm/configs/omap2plus_defconfig

View file

2

arch/arm/configs/sama5_defconfig

View file

1

arch/arm/configs/sunxi_defconfig

View file

2

arch/arm/configs/vexpress_defconfig

View file

2

arch/arm/include/asm/kvm_mmu.h

View file

1

arch/arm/include/asm/pmu.h

View file

5

arch/arm/include/debug/at91.S

View file

21

arch/arm/kernel/perf_event.c

View file

71

arch/arm/kernel/perf_event_cpu.c

View file

525

arch/arm/kernel/perf_event_v7.c

View file

2

arch/arm/kvm/arm.c

View file

10

arch/arm/kvm/trace.h

View file

2

arch/arm/mach-asm9260/Kconfig

View file

22

arch/arm/mach-at91/pm.c

View file

2

arch/arm/mach-at91/pm.h

View file

80

arch/arm/mach-at91/pm_slowclock.S

View file

3

arch/arm/mach-exynos/platsmp.c

View file

28

arch/arm/mach-exynos/pm_domains.c

View file

4

arch/arm/mach-exynos/suspend.c

View file

5

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

View file

8

arch/arm/mach-msm/board-halibut.c

View file

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