diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-17 05:33:32 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-17 05:35:04 (GMT) |
commit | 07689b0a5c26176c528d7864b93188045439f49b (patch) | |
tree | 0253c3094f4558bbb78f0a84f3a1baf27b330907 /include/keys | |
parent | 51d7cccf07238f5236c5b9269231a30dd5f8e714 (diff) | |
parent | 869dd4662f90514cb92b44a389e85c737b464e25 (diff) | |
download | linux-fsl-qoriq-07689b0a5c26176c528d7864b93188045439f49b.tar.xz |
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/keys')
0 files changed, 0 insertions, 0 deletions