diff options
author | 2015-06-23 01:24:48 -0700 | |
---|---|---|
committer | 2015-06-23 01:24:48 -0700 | |
commit | 1f02c09bc34a892b4a7c67e7ffa036b96794e69b (patch) | |
tree | 7f27aed5275a175c79f07f57d4b1e55fb81677f4 /drivers/net/bonding/bond_sysfs.c | |
parent | inet_diag: Remove _bh suffix in inet_diag_dump_reqs(). (diff) | |
parent | net/macb: add config for Atmel sama5d2 SoCs (diff) | |
download | linux-dev-1f02c09bc34a892b4a7c67e7ffa036b96794e69b.tar.xz linux-dev-1f02c09bc34a892b4a7c67e7ffa036b96794e69b.zip |
Merge branch 'macb-sama5d2'
Nicolas Ferre says:
====================
net/macb: add sama5d2 support
This series is basically the support for another flavor of the GEM IP
configuration. It ended up being a series because of some little fixes made to
the binding documentation before adding the new compatibility string.
Bye,
v2: - fix bindings
- add sama5d2 compatibility string to the binding documentation
====================
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
0 files changed, 0 insertions, 0 deletions