]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
net/macb: bindings doc: Merge cdns-emac to macb
authorMichal Simek <michal.simek@xilinx.com>
Mon, 30 Nov 2015 13:51:46 +0000 (14:51 +0100)
committerRob Herring <robh@kernel.org>
Wed, 9 Dec 2015 21:30:56 +0000 (15:30 -0600)
commitd6403108aaf413c9677040c20519e5c14c2f6f7c
tree0a103d4860fc43577da9cb9031e9c1b98f52d7dc
parent1da2f213cfaef8e3b8a93c7779d96691d226083b
net/macb: bindings doc: Merge cdns-emac to macb

Merge two bindings for the same driver to together.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Documentation/devicetree/bindings/net/cdns-emac.txt [deleted file]
Documentation/devicetree/bindings/net/macb.txt