aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sock_diag.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-30 13:46:54 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-30 13:46:54 -0500
commit56be178875cf699a17cc285171492353620ef0ae (patch)
tree26b8f0473d5c8f6fcbc50d76bb30aae0dd176bd5 /include/linux/sock_diag.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parenttipc: rename struct bearer_name to struct tipc_bearer_names (diff)
downloadlinux-dev-56be178875cf699a17cc285171492353620ef0ae.tar.xz
linux-dev-56be178875cf699a17cc285171492353620ef0ae.zip
Merge branch 'tipc-Dec29-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'include/linux/sock_diag.h')
0 files changed, 0 insertions, 0 deletions