Merge branch 'macb-sama5d2'

Browse source

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>

...

This commit is contained in:

David S. Miller 2015-06-23 01:24:48 -07:00

parent 3b1884435a 5c8fe711c7

commit 1f02c09bc3

2 changed files with 11 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

Documentation/devicetree/bindings/net/macb.txt

View file

8

drivers/net/ethernet/cadence/macb.c

View file