From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Jul 2012 18:53:47 +0000 (-0700)
Subject: Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux
X-Git-Tag: v5.15~22137
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=62ad64498a2e72eb9fb70ab80e20ecc9cac8d40b;p=mirror_ubuntu-kernels.git

Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux

Pull DT fixes from Rob Herring:
 "Mainly some documentation updates and 2 fixes:

   - An export symbol fix for of_platform_populate from Stephen W.
   - A fix for the order compatible entries are matched to ensure the
     first compatible string is matched when there are multiple matches."

Normally these would go through Grant Likely (thus the "fixes-for-grant"
branch name), but Grant is in the middle of moving to Scotland, and is
practically offline until sometime in August. So pull directly from Rob.

* 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux:
  of: match by compatible property first
  dt: mc13xxx.txt: Fix gpio number assignment
  dt: fsl-fec.txt: Fix gpio number assignment
  dt: fsl-mma8450.txt: Add missing 'reg' description
  dt: fsl-imx-esdhc.txt: Fix gpio number assignment
  dt: fsl-imx-cspi.txt: Fix comment about GPIOs used for chip selects
  of: Add Avionic Design vendor prefix
  of: export of_platform_populate()
---

62ad64498a2e72eb9fb70ab80e20ecc9cac8d40b