Linux 4.1-rc6

Browse source

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVa7zvAAoJEHm+PkMAQRiGtfMIAILs3sxFtrC1hApgcfRLF/7z
 K34bwTRqErzqUO/orTwakEr9kSIpIL0zIPSryTCOTPZLfMGkQjhHXO3KR/DSbbTV
 MZ8y/BM/yelFA/Np+1LjbiYjTNRnTRvCoaQihkIH8Rn02g7ob9HyL4gIGKpuGFcZ
 04GacL2cgChqsRSACdNef948jCoJXKgcuDpe39DXphDWZnBKNZ3HFuJ6bryGJf9A
 1/eCI4is85BNwKPemQUYR0xx83UIzDfrghatZP2mOCDDSA2MNg8HNxLTd12LGoQD
 tfgX4B7aftzW9Y7GSEDfZ0IKm2NRzgPmCVj6PjVR/iI0lIK4Aq0Z/lDJxxEq3XQ=
 =AJM5
 -----END PGP SIGNATURE-----

Merge tag 'v4.1-rc6' into next/dt

Linux 4.1-rc6

 Conflicts:
	arch/arm/boot/dts/zynq-7000.dtsi

Resolution summary:

 Mainline had an earlier version of the commit, resolve in favor of the
 newer patch in next/dt branch.

...

This commit is contained in:

Kevin Hilman 2015-06-11 14:37:45 -07:00

parent e28f23d8aa c65b99f046

commit ecdf94da6f

671 changed files with 6831 additions and 5589 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/ABI/testing/sysfs-devices-system-cpu

View file

4

Documentation/devicetree/bindings/clock/silabs,si5351.txt

View file

6

Documentation/devicetree/bindings/mtd/m25p80.txt → Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

View file

3

Documentation/devicetree/bindings/net/cdns-emac.txt

View file

2

Documentation/hwmon/tmp401

View file

3

Documentation/serial/tty.txt

View file

33

Documentation/target/tcmu-design.txt

View file

18

Documentation/virtual/kvm/mmu.txt

View file

66

MAINTAINERS

View file

2

Makefile

View file

16

arch/alpha/boot/Makefile

View file

1

arch/alpha/boot/main.c

View file

306

arch/alpha/boot/stdio.c

View file

3

arch/alpha/boot/tools/objstrip.c

View file

1

arch/alpha/include/asm/types.h

View file

2

arch/alpha/include/asm/unistd.h

View file

3

arch/alpha/include/uapi/asm/unistd.h

View file

1

arch/alpha/kernel/err_ev6.c

View file

1

arch/alpha/kernel/irq.c

View file

3

arch/alpha/kernel/osf_sys.c

View file

7

arch/alpha/kernel/process.c

View file

8

arch/alpha/kernel/smp.c

View file

3

arch/alpha/kernel/srmcons.c

View file

2

arch/alpha/kernel/sys_marvel.c

View file

3

arch/alpha/kernel/systbls.S

View file

1

arch/alpha/kernel/traps.c

View file

1

arch/alpha/oprofile/op_model_ev4.c

View file

1

arch/alpha/oprofile/op_model_ev5.c

View file

1

arch/alpha/oprofile/op_model_ev6.c

View file

1

arch/alpha/oprofile/op_model_ev67.c

View file

13

arch/arc/Kconfig.debug

View file

2

arch/arc/include/asm/atomic.h

View file

4

arch/arc/mm/cache_arc700.c

View file

2

arch/arm/boot/dts/Makefile

View file

4

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

View file

2

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

View file

2

arch/arm/boot/dts/armada-375.dtsi

View file

2

arch/arm/boot/dts/armada-38x.dtsi

View file

2

arch/arm/boot/dts/armada-39x.dtsi

View file

1

arch/arm/boot/dts/dove-cubox.dts

View file

2

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

View file

1

arch/arm/boot/dts/exynos5420-peach-pit.dts

View file

1

arch/arm/boot/dts/exynos5800-peach-pi.dts

View file

2

arch/arm/boot/dts/imx27.dtsi

View file

2

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

View file

1

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

View file

11

arch/arm/boot/dts/vexpress-v2p-ca9.dts

View file

2

arch/arm/configs/multi_v7_defconfig

View file

4

arch/arm/kernel/entry-common.S

View file

9

arch/arm/kernel/perf_event_cpu.c

View file

2

arch/arm/mach-exynos/common.h

View file

27

arch/arm/mach-exynos/exynos.c

View file

39

arch/arm/mach-exynos/platsmp.c

View file

4

arch/arm/mach-exynos/pm_domains.c

View file

7

arch/arm/mach-exynos/suspend.c

View file

4

arch/arm/mach-gemini/common.h

View file

4

arch/arm/mach-gemini/reset.c

View file

16

arch/arm/mach-imx/gpc.c

View file

68

arch/arm/mach-omap2/omap_hwmod.c

View file

70

arch/arm/mach-omap2/omap_hwmod_43xx_data.c

View file

3

arch/arm/mach-omap2/prcm43xx.h

View file

20

arch/arm/mach-omap2/prminst44xx.c

View file

13

arch/arm/mach-omap2/timer.c

View file

2

arch/arm/mach-pxa/pxa_cplds_irqs.c

View file

26

arch/arm/mach-rockchip/pm.c

View file

4

arch/arm/mach-rockchip/pm.h

View file

20

arch/arm/mm/mmu.c

View file

42

arch/arm/net/bpf_jit_32.c

View file

1

arch/arm/xen/enlighten.c

View file

31

arch/arm64/boot/dts/arm/juno-motherboard.dtsi

View file

22

arch/arm64/crypto/crc32-arm64.c

View file

3

arch/arm64/crypto/sha1-ce-glue.c

View file

3

arch/arm64/crypto/sha2-ce-glue.c

View file

53

arch/arm64/kernel/alternative.c

View file

8

arch/arm64/kernel/perf_event.c

View file

2

arch/arm64/mm/dump.c

View file

2

arch/arm64/net/bpf_jit_comp.c

View file

13

arch/ia64/pci/pci.c

View file

2

arch/mips/Makefile

View file

3

arch/mips/ath79/prom.c

View file

2

arch/mips/configs/fuloong2e_defconfig

View file

4

arch/mips/include/asm/elf.h

View file

2

arch/mips/include/asm/smp.h

View file

32

arch/mips/kernel/elf.c

View file

2

arch/mips/kernel/irq.c

View file

2

arch/mips/kernel/ptrace.c

View file

2

arch/mips/kernel/smp-bmips.c

View file

2

arch/mips/kernel/smp-cps.c

View file

6

arch/mips/kernel/smp.c

View file

1

arch/mips/kernel/traps.c

View file

6

arch/mips/kvm/emulate.c

View file

15

arch/mips/lib/strnlen_user.S

View file

4

arch/mips/math-emu/cp1emu.c

View file

2

arch/mips/mm/tlb-r4k.c

View file

4

arch/mips/sgi-ip32/ip32-platform.c

View file

4

arch/parisc/include/asm/elf.h

View file

10

arch/parisc/kernel/process.c

View file

3

arch/parisc/kernel/sys_parisc.c

View file

4

arch/powerpc/kernel/mce.c

View file

1

arch/powerpc/kernel/vmlinux.lds.S

View file

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