From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Feb 2014 22:35:05 +0000 (-0800)
Subject: Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
X-Git-Tag: v3.14-rc4~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10527106abec1e72a3b1f06fe58f0162603ed9df;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull devicetree fixes from Grant Likely:
 "Device tree compatible match order bug fix

  This branch contains a bug fix for the way devicetree code identifies
  the type of device.  Device drivers can contain a list of
  of_device_ids, but it more than one entry will match, then the device
  driver may choose the wrong one.  Commit 105353145e, "match each node
  compatible against all given matches first", was queued for v3.14 but
  ended up causing other bugs.  Commit 06b29e76a7 attempted to fix it
  but it had other bugs.  Merely reverting the fix and waiting until
  v3.15 isn't a good option because there is code in v3.14 that depends
  on the revised behaviour to boot.

  This branch should finally fixes the problem correctly.  This time
  instead of just hoping that the patch is correct, this branch also
  adds new testcases that validate the behaviour.

  The changes in this branch are larger than I would like for a -rc
  pull, but moving the test case data out of out of arch/arm so that it
  could be validated on other architectures was important"

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
  of: Add self test for of_match_node()
  of: Move testcase FDT data into drivers/of
  of: reimplement the matching method for __of_match_node()
  Revert "of: search the best compatible match first in __of_match_node()"
---

10527106abec1e72a3b1f06fe58f0162603ed9df