Merge 4.1-rc7 into tty-next
This fixes up a merge issue with the amba-pl011.c driver, and we want
the fixes in this branch as well.
Signed-off-by: 
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-devices-system-cpu 1 addition, 1 deletionDocumentation/ABI/testing/sysfs-devices-system-cpu
- Documentation/devicetree/bindings/clock/silabs,si5351.txt 3 additions, 1 deletionDocumentation/devicetree/bindings/clock/silabs,si5351.txt
- Documentation/devicetree/bindings/net/cdns-emac.txt 2 additions, 1 deletionDocumentation/devicetree/bindings/net/cdns-emac.txt
- Documentation/devicetree/bindings/usb/renesas_usbhs.txt 2 additions, 4 deletionsDocumentation/devicetree/bindings/usb/renesas_usbhs.txt
- Documentation/hwmon/tmp401 1 addition, 1 deletionDocumentation/hwmon/tmp401
- Documentation/target/tcmu-design.txt 7 additions, 26 deletionsDocumentation/target/tcmu-design.txt
- Documentation/virtual/kvm/mmu.txt 14 additions, 4 deletionsDocumentation/virtual/kvm/mmu.txt
- MAINTAINERS 16 additions, 13 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/boot/Makefile 10 additions, 6 deletionsarch/alpha/boot/Makefile
- arch/alpha/boot/main.c 0 additions, 1 deletionarch/alpha/boot/main.c
- arch/alpha/boot/stdio.c 306 additions, 0 deletionsarch/alpha/boot/stdio.c
- arch/alpha/boot/tools/objstrip.c 3 additions, 0 deletionsarch/alpha/boot/tools/objstrip.c
- arch/alpha/include/asm/types.h 0 additions, 1 deletionarch/alpha/include/asm/types.h
- arch/alpha/include/asm/unistd.h 1 addition, 1 deletionarch/alpha/include/asm/unistd.h
- arch/alpha/include/uapi/asm/unistd.h 3 additions, 0 deletionsarch/alpha/include/uapi/asm/unistd.h
- arch/alpha/kernel/err_ev6.c 0 additions, 1 deletionarch/alpha/kernel/err_ev6.c
- arch/alpha/kernel/irq.c 0 additions, 1 deletionarch/alpha/kernel/irq.c
- arch/alpha/kernel/osf_sys.c 1 addition, 2 deletionsarch/alpha/kernel/osf_sys.c
- arch/alpha/kernel/process.c 3 additions, 4 deletionsarch/alpha/kernel/process.c
Loading
Please register or sign in to comment