From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Mar 2015 19:33:01 +0000 (-0700)
Subject: Merge tag 'devicetree-fixes-for-4.0-part2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb8ef2fbb836c159ba847757123b8e33284406f8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'devicetree-fixes-for-4.0-part2' of git://git./linux/kernel/git/robh/linux

Pull more DeviceTree fixes vfom Rob Herring:

 - revert setting stdout-path as preferred console.  This caused
   regressions in PowerMACs and other systems.

 - yet another fix for stdout-path option parsing.

 - fix error path handling in of_irq_parse_one

* tag 'devicetree-fixes-for-4.0-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  Revert "of: Fix premature bootconsole disable with 'stdout-path'"
  of: handle both '/' and ':' in path strings
  of: unittest: Add option string test case with longer path
  of/irq: Fix of_irq_parse_one() returned error codes
---

bb8ef2fbb836c159ba847757123b8e33284406f8