diff options
| author | David S. Miller <davem@davemloft.net> | 2013-11-04 22:48:30 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-04 22:48:30 +0400 |
| commit | 394efd19d5fcae936261bd48e5b33b21897aacf8 (patch) | |
| tree | c48cf3ddbb07fd87309f1abdf31a27c71330e587 /Documentation/zh_CN/stable_api_nonsense.txt | |
| parent | f421436a591d34fa5279b54a96ac07d70250cc8d (diff) | |
| parent | be408cd3e1fef73e9408b196a79b9934697fe3b1 (diff) | |
| download | linux-394efd19d5fcae936261bd48e5b33b21897aacf8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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>
Diffstat (limited to 'Documentation/zh_CN/stable_api_nonsense.txt')
0 files changed, 0 insertions, 0 deletions