Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree fixes and reverts from Grant Likely: "One bug fix and three reverts. The reverts back out the slightly controversial feeding the entire device tree into the random pool and the reserved-memory binding which isn't fully baked yet. Expect the reserved-memory patches at least to resurface for v3.13. The bug fixes removes a scary but harmless warning on SPARC that was introduced in the v3.12 merge window. v3.13 will contain a proper fix that makes the new code work on SPARC. On the plus side, the diffstat looks *awesome*. I love removing lines of code" * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux: Revert "drivers: of: add initialization code for dma reserved memory" Revert "ARM: init: add support for reserved memory defined by device tree" Revert "of: Feed entire flattened device tree into the random pool" of: fix unnecessary warning on missing /cpus node
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/memory.txt 0 additions, 168 deletionsDocumentation/devicetree/bindings/memory.txt
- arch/arm/mm/init.c 0 additions, 3 deletionsarch/arm/mm/init.c
- drivers/of/Kconfig 0 additions, 6 deletionsdrivers/of/Kconfig
- drivers/of/Makefile 0 additions, 1 deletiondrivers/of/Makefile
- drivers/of/base.c 1 addition, 3 deletionsdrivers/of/base.c
- drivers/of/fdt.c 0 additions, 12 deletionsdrivers/of/fdt.c
- drivers/of/of_reserved_mem.c 0 additions, 173 deletionsdrivers/of/of_reserved_mem.c
- drivers/of/platform.c 0 additions, 4 deletionsdrivers/of/platform.c
- include/linux/of_reserved_mem.h 0 additions, 14 deletionsinclude/linux/of_reserved_mem.h
Loading
Please register or sign in to comment