diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-07 16:51:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-07 16:51:22 -0400 |
| commit | c1a58d6a8d31ce133ff992e602655c29deb13e60 (patch) | |
| tree | ade90e43e866c92f4dc09594a13115d1511c2af4 /net/netfilter/xt_owner.c | |
| parent | 698365fa1874aa7635d51667a34a2842228e9837 (diff) | |
| parent | 6e4b82730c7525504fc485b370c7f09e594e2e96 (diff) | |
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>
Diffstat (limited to 'net/netfilter/xt_owner.c')
0 files changed, 0 insertions, 0 deletions