Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jun 2015 04:43:29 +0000 (21:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jun 2015 04:43:29 +0000 (21:43 -0700)
commitbe19c4ab813a0fec6cd8204a998e8904ad0f8ed3
tree0548c796e84c18843c9ee20368c4e7a240c8e9c1
parent4b1706927d8ebc9e0be6802b6d6918ad9f3d6843
parentf76502aa9140ec338a59487218bf70a9c9e92b8f
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