summaryrefslogtreecommitdiffstats
path: root/fs/bfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-15 17:14:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-15 17:14:13 -0700
commit34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (patch)
treec5fe826846f5bf532e56e1e39ee789047a700d59 /fs/bfs
parentba0a062ef55a6f8e8361a63ee48e654879ba00bf (diff)
parent1931ee143b0ab72924944bc06e363d837ba05063 (diff)
downloadop-kernel-dev-34ec4de42be5006abdd8d0c08b306ffaa64d0d5d.zip
op-kernel-dev-34ec4de42be5006abdd8d0c08b306ffaa64d0d5d.tar.gz
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
Diffstat (limited to 'fs/bfs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud