Merge 4.0-rc5 into char-misc-next

Browse source

We want those fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Greg Kroah-Hartman 2015-03-25 10:51:53 +01:00

parent e9533ae539 bc465aa9d0

commit ff85f707ac

529 changed files with 6352 additions and 4661 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

2

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

View file

4

Documentation/devicetree/bindings/arm/sti.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

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

26

MAINTAINERS

View file

2

Makefile

View file

1

arch/arm/Makefile

View file

8

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

12

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

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

10

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

View file

10

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

2

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

View file

2

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

View file

4

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

2

arch/arm/configs/multi_v7_defconfig

View file

1

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

12

arch/arm/crypto/aesbs-core.S_shipped

View file

12

arch/arm/crypto/bsaes-armv7.pl

View file

15

arch/arm/include/asm/kvm_mmu.h

View file

5

arch/arm/include/debug/at91.S

View file

5

arch/arm/kernel/setup.c

View file

75

arch/arm/kvm/mmu.c

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

10

arch/arm/mach-omap2/omap_hwmod.c

View file

1

arch/arm/mach-omap2/omap_hwmod.h

View file

103

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

View file

1

arch/arm/mach-omap2/pdata-quirks.c

View file

4

arch/arm/mach-omap2/prm44xx.c

View file

1

arch/arm/mach-pxa/idp.c

View file

2

arch/arm/mach-pxa/lpd270.c

View file

4

arch/arm/mach-sa1100/neponset.c

View file

2

arch/arm/mach-sa1100/pleb.c

View file

2

arch/arm/mach-socfpga/core.h

View file

5

arch/arm/mach-socfpga/socfpga.c

View file

1

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

View file

33

arch/arm/mm/cache-l2x0.c

View file

2

arch/arm/mm/dma-mapping.c

View file

1

arch/arm/mm/fault.c

View file

5

arch/arm/mm/pageattr.c

View file

4

arch/arm64/boot/dts/apm/apm-storm.dtsi

View file

5

arch/arm64/include/asm/kvm_arm.h

View file

48

arch/arm64/include/asm/kvm_mmu.h

View file

6

arch/arm64/include/asm/proc-fns.h

View file

3

arch/arm64/include/asm/tlb.h

View file

13

arch/arm64/include/asm/tlbflush.h

View file

15

arch/arm64/kernel/efi.c

View file

2

arch/arm64/kernel/head.S

View file

8

arch/arm64/kernel/process.c

View file

12

arch/arm64/mm/dma-mapping.c

View file

5

arch/c6x/include/asm/pgtable.h

View file

7

arch/microblaze/kernel/entry.S

View file

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