forked from luck/tmp_suning_uos_patched
394efd19d5
Conflicts:
drivers/net/ethernet/emulex/benet/be.h
drivers/net/netconsole.c
net/bridge/br_private.h
Three mostly trivial conflicts.
The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.
In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".
Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|---|---|---|
| .. | ||
| lmc | ||
| .gitignore | ||
| c101.c | ||
| cosa.c | ||
| cosa.h | ||
| dlci.c | ||
| dscc4.c | ||
| farsync.c | ||
| farsync.h | ||
| hd64570.c | ||
| hd64570.h | ||
| hd64572.c | ||
| hd64572.h | ||
| hdlc_cisco.c | ||
| hdlc_fr.c | ||
| hdlc_ppp.c | ||
| hdlc_raw_eth.c | ||
| hdlc_raw.c | ||
| hdlc_x25.c | ||
| hdlc.c | ||
| hostess_sv11.c | ||
| ixp4xx_hss.c | ||
| Kconfig | ||
| lapbether.c | ||
| Makefile | ||
| n2.c | ||
| pc300too.c | ||
| pci200syn.c | ||
| sbni.c | ||
| sbni.h | ||
| sdla.c | ||
| sealevel.c | ||
| wanxl.c | ||
| wanxl.h | ||
| wanxlfw.inc_shipped | ||
| wanxlfw.S | ||
| x25_asy.c | ||
| x25_asy.h | ||
| z85230.c | ||
| z85230.h | ||