forked from Minki/linux
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>
|
||
|---|---|---|
| .. | ||
| adapter.h | ||
| ael1002.c | ||
| aq100x.c | ||
| common.h | ||
| cxgb3_ctl_defs.h | ||
| cxgb3_defs.h | ||
| cxgb3_ioctl.h | ||
| cxgb3_main.c | ||
| cxgb3_offload.c | ||
| cxgb3_offload.h | ||
| firmware_exports.h | ||
| l2t.c | ||
| l2t.h | ||
| Makefile | ||
| mc5.c | ||
| regs.h | ||
| sge_defs.h | ||
| sge.c | ||
| t3_cpl.h | ||
| t3_hw.c | ||
| t3cdev.h | ||
| version.h | ||
| vsc8211.c | ||
| xgmac.c | ||