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>
|
||
|---|---|---|
| .. | ||
| configs | ||
| hpux | ||
| include | ||
| kernel | ||
| lib | ||
| math-emu | ||
| mm | ||
| oprofile | ||
| Kconfig | ||
| Kconfig.debug | ||
| Makefile | ||
| defpalo.conf | ||
| install.sh | ||
| nm | ||