diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-28 23:42:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-28 23:42:42 -0800 |
| commit | 52efcea59eeae9f850e544c41764954273b0912c (patch) | |
| tree | bd2114136c6b2e1cca097f68933f2d2943b433ed /drivers/net/tun.c | |
| parent | 33f9e6f57eb91cafcee4d8f185487bce6787957b (diff) | |
| parent | 589dcb8a3fbb9a8d12d32b0a85326cfbd9cd5735 (diff) | |
Merge branch 'DT'
Sergei Shtylyov says:
====================
DT: net: davinci_emac: couple more properties actually optional
Though described as required, couple more properties in the DaVinci EMAC
binding are actually optional, as the driver will happily function without them.
The patchset is against DaveM's 'net.git' tree this time.
[1/2] DT: net: davinci_emac: "ti,davinci-rmii-en" property is actually optional
[2/2] DT: net: davinci_emac: "ti,davinci-no-bd-ram" property is actually optional
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
0 files changed, 0 insertions, 0 deletions