From: David S. Miller <davem@davemloft.net>
Date: Wed, 7 May 2014 20:51:22 +0000 (-0400)
Subject: Merge branch 'micrel_ksz9031'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1a58d6a8d31ce133ff992e602655c29deb13e60;p=linux-beck.git

Merge branch 'micrel_ksz9031'

Hubert Chaumette says:

====================
net/phy: micrel: Add DT configuration support and documentation for KSZ9031

 - Adds DT configuration support for ksz9031
 - Renames micrel-ksz9021.txt to micrel-ksz90x1.txt and adds ksz9031 binding
   documentation

Changes since v3:
 - Rebased on net-next
Changes since v2:
 - Merged together ksz9031_load_{clk,data,ctrl}_skew_values()
 - Added field length and number of fields prameter to account for registers
  specificities
 - Added binding documentation
Changes since v1:
 - Removed ksz9021 and ksz9031 fixup deletions from arch/arm/mach-imx/mach-imx6q.c

Hubert Chaumette (2):
  Update Micrel KSZ90x1 binding documentation
  ARM: i.MX6: Add OF configuration support for ksz9031
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

c1a58d6a8d31ce133ff992e602655c29deb13e60