aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/etherdevice.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-16 22:33:32 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-16 22:35:04 -0700
commit07689b0a5c26176c528d7864b93188045439f49b (patch)
tree0253c3094f4558bbb78f0a84f3a1baf27b330907 /include/linux/etherdevice.h
parentnet: make sock diag per-namespace (diff)
parenttipc: remove print_buf and deprecated log buffer code (diff)
downloadlinux-dev-07689b0a5c26176c528d7864b93188045439f49b.tar.xz
linux-dev-07689b0a5c26176c528d7864b93188045439f49b.zip
Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Paul Gortmaker says: ==================== This is the same eight commits as sent for review last week[1], with just the incorporation of the pr_fmt change as suggested by JoeP. There was no additional change requests, so unless you can see something else you'd like me to change, please pull. ... Erik Hugne (5): tipc: use standard printk shortcut macros (pr_err etc.) tipc: remove TIPC packet debugging functions and macros tipc: simplify print buffer handling in tipc_printf tipc: phase out most of the struct print_buf usage tipc: remove print_buf and deprecated log buffer code Paul Gortmaker (3): tipc: factor stats struct out of the larger link struct tipc: limit error messages relating to memory leak to one line tipc: simplify link_print by divorcing it from using tipc_printf ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/etherdevice.h')
0 files changed, 0 insertions, 0 deletions