From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Jun 2015 04:43:29 +0000 (-0700)
Subject: Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~1678
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be19c4ab813a0fec6cd8204a998e8904ad0f8ed3;p=firefly-linux-kernel-4.4.55.git

Merge tag 'devicetree-for-linus' of git://git./linux/kernel/git/glikely/linux

Pull devicetree fix from Grant Likely:
 "Stupid typo fix for v4.1.  One of the IS_ENABLED() macro calls forgot
  the CONFIG_ prefix.  Only affects a tiny number of platforms, but
  still..."

* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
  of/dynamic: Fix test for PPC_PSERIES
---

be19c4ab813a0fec6cd8204a998e8904ad0f8ed3