| commit | 04f58c88542b6b351efb4eea01134eb672e22e6e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Mar 25 20:29:20 2014 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Tue Mar 25 20:29:20 2014 -0400 |
| tree | 47bb617212f8c8951f35730e324bdc43487a01ca | |
| parent | 0fc31966035d7a540c011b6c967ce8eae1db121b [diff] | |
| parent | 632b06aa2842b12c6d6a510ec080fb6ebdb38ea5 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>