Merge branch 'linus' into locking/core, to fix up conflicts
Conflicts:
mm/page_alloc.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
No related branches found
No related tags found
Showing
- Documentation/Makefile 2 additions, 10 deletionsDocumentation/Makefile
- Documentation/arm/firmware.txt 1 addition, 1 deletionDocumentation/arm/firmware.txt
- Documentation/conf.py 3 additions, 3 deletionsDocumentation/conf.py
- Documentation/core-api/genalloc.rst 144 additions, 0 deletionsDocumentation/core-api/genalloc.rst
- Documentation/core-api/index.rst 1 addition, 0 deletionsDocumentation/core-api/index.rst
- Documentation/dev-tools/gdb-kernel-debugging.rst 4 additions, 2 deletionsDocumentation/dev-tools/gdb-kernel-debugging.rst
- Documentation/dev-tools/kgdb.rst 10 additions, 1 deletionDocumentation/dev-tools/kgdb.rst
- Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt 32 additions, 0 deletions...tation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt
- Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt 0 additions, 12 deletions...n/devicetree/bindings/display/exynos/exynos5433-decon.txt
- Documentation/devicetree/bindings/display/repaper.txt 52 additions, 0 deletionsDocumentation/devicetree/bindings/display/repaper.txt
- Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt 5 additions, 2 deletions...devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
- Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt 4 additions, 0 deletions...ion/devicetree/bindings/display/rockchip/rockchip-vop.txt
- Documentation/devicetree/bindings/display/sitronix,st7586.txt 22 additions, 0 deletions...mentation/devicetree/bindings/display/sitronix,st7586.txt
- Documentation/devicetree/bindings/display/st,stm32-ltdc.txt 103 additions, 2 deletionsDocumentation/devicetree/bindings/display/st,stm32-ltdc.txt
- Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt 27 additions, 9 deletions...mentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
- Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt 9 additions, 0 deletionsDocumentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt
- Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt 21 additions, 0 deletionsDocumentation/devicetree/bindings/hwmon/ibm,cffps1.txt
- Documentation/devicetree/bindings/hwmon/ltq-cputemp.txt 10 additions, 0 deletionsDocumentation/devicetree/bindings/hwmon/ltq-cputemp.txt
- Documentation/devicetree/bindings/net/dwmac-sun8i.txt 0 additions, 84 deletionsDocumentation/devicetree/bindings/net/dwmac-sun8i.txt
- Documentation/devicetree/bindings/vendor-prefixes.txt 1 addition, 0 deletionsDocumentation/devicetree/bindings/vendor-prefixes.txt
Loading
Please register or sign in to comment