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> |
||
---|---|---|
.. | ||
audit.h | ||
avc.h | ||
avc_ss.h | ||
classmap.h | ||
conditional.h | ||
initial_sid_to_string.h | ||
netif.h | ||
netlabel.h | ||
netnode.h | ||
netport.h | ||
objsec.h | ||
security.h | ||
xfrm.h |