-
- Downloads
Merge 3.13-rc5 into staging-next
We want these fixes here to handle some merge issues.
Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing
- CREDITS 5 additions, 0 deletionsCREDITS
- Documentation/DocBook/media/v4l/vidioc-expbuf.xml 5 additions, 3 deletionsDocumentation/DocBook/media/v4l/vidioc-expbuf.xml
- Documentation/assoc_array.txt 3 additions, 3 deletionsDocumentation/assoc_array.txt
- Documentation/device-mapper/cache.txt 6 additions, 4 deletionsDocumentation/device-mapper/cache.txt
- Documentation/devicetree/bindings/net/davinci_emac.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/davinci_emac.txt
- Documentation/devicetree/bindings/net/smsc-lan91c111.txt 4 additions, 0 deletionsDocumentation/devicetree/bindings/net/smsc-lan91c111.txt
- Documentation/mic/mpssd/mpssd.c 12 additions, 6 deletionsDocumentation/mic/mpssd/mpssd.c
- Documentation/module-signing.txt 240 additions, 0 deletionsDocumentation/module-signing.txt
- Documentation/networking/ip-sysctl.txt 6 additions, 2 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/networking/packet_mmap.txt 10 additions, 0 deletionsDocumentation/networking/packet_mmap.txt
- MAINTAINERS 69 additions, 15 deletionsMAINTAINERS
- Makefile 10 additions, 14 deletionsMakefile
- arch/arc/Kconfig 1 addition, 0 deletionsarch/arc/Kconfig
- arch/arc/include/uapi/asm/unistd.h 11 additions, 0 deletionsarch/arc/include/uapi/asm/unistd.h
- arch/arc/kernel/perf_event.c 2 additions, 2 deletionsarch/arc/kernel/perf_event.c
- arch/arm/boot/dts/am3517-evm.dts 3 additions, 3 deletionsarch/arm/boot/dts/am3517-evm.dts
- arch/arm/boot/dts/am3517.dtsi 63 additions, 0 deletionsarch/arm/boot/dts/am3517.dtsi
- arch/arm/boot/dts/omap3-n900.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-n900.dts
- arch/arm/boot/dts/omap3-n950-n9.dtsi 1 addition, 1 deletionarch/arm/boot/dts/omap3-n950-n9.dtsi
- arch/arm/boot/dts/omap34xx-hs.dtsi 16 additions, 0 deletionsarch/arm/boot/dts/omap34xx-hs.dtsi
Loading
Please register or sign in to comment