From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 16 Feb 2017 16:15:39 +0000 (+0100)
Subject: Merge tag 'davinci-for-v4.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=af1d09eefa72089300ddde13bbaf9af1a82c6be1;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'davinci-for-v4.11/soc-2' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/soc

Pull "SoC updates needed for SATA support on DA850" from Sekhar Nori:

This includes a merge of non-critical-fixes
branch already queued for v4.11 because
SATA clock addition conflicts with the fix-up
done earlier.

* tag 'davinci-for-v4.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: remove BUG_ON() from da850_register_sata()
  ARM: davinci: da850: model the SATA refclk
  ARM: davinci: da850: add con_id for the SATA clock
  ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for SATA
  ARM: davinci: add skeleton for pdata-quirks
  bus: da850-mstpri: fix my e-mail address
  ARM: davinci: da850: fix da850_set_pll0rate()
  ARM: davinci: da850: coding style fix
---

af1d09eefa72089300ddde13bbaf9af1a82c6be1