aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_sockglue.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-11-03 15:31:34 -0400
committerDavid S. Miller <davem@davemloft.net>2016-11-03 15:31:34 -0400
commit1b99e5e854d4de2d795c4dbed7cc59c65ae372fe (patch)
tree767fca6126bc2b67592d73eb72e1a6a881b30190 /net/ipv4/ip_sockglue.c
parentMerge branch 'diag-raw-fixes' (diff)
parentdt-bindings: net: Add OXNAS DWMAC Bindings (diff)
downloadlinux-dev-1b99e5e854d4de2d795c4dbed7cc59c65ae372fe.tar.xz
linux-dev-1b99e5e854d4de2d795c4dbed7cc59c65ae372fe.zip
Merge branch 'stmmac-OXNAS'
Neil Armstrong says: ==================== net: stmmac: Add OXNAS DWMAC Glue This patchset add support for the Sysnopsys DWMAC Gigabit Ethernet controller Glue layer of the Oxford Semiconductor OX820 SoC. Changes since v2 at http://lkml.kernel.org/r/20161031105345.16711-1-narmstrong@baylibre.com : - Disable/Unprepare clock if regmap read fails in oxnas_dwmac_init Changes since v1 at https://patchwork.kernel.org/patch/9388231/ : - Split dt-bindings in a separate patch - Add IP version in the dt-bindings compatible - Check return of clk_prepare_enable() - use get_stmmac_bsp_priv() helper - hardwire setup values in oxnas_dwmac_init() Changes since RFC at https://patchwork.kernel.org/patch/9387257 : - Drop init/exit callbacks - Implement proper remove and PM callback - Call init from probe - Disable/Unprepare clock if stmmac probe fails ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
0 files changed, 0 insertions, 0 deletions