summaryrefslogtreecommitdiff
path: root/net/tipc/net.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-09-15 16:32:31 +0200
committerTakashi Iwai <tiwai@suse.de>2012-09-15 16:32:31 +0200
commite5d6db8e6039d7f51a9a648d74db1109c7fdc746 (patch)
tree1f8ec13b6bda70fdf6c607a86d02c3e974e4c469 /net/tipc/net.h
parent62cbde1868b16e7cf1ed115cdfb9cbe82e230f0a (diff)
parent5efbc2610a7b2aac6c51f8fc943c019106568939 (diff)
downloadlinux-stable-e5d6db8e6039d7f51a9a648d74db1109c7fdc746.tar.gz
linux-stable-e5d6db8e6039d7f51a9a648d74db1109c7fdc746.tar.bz2
linux-stable-e5d6db8e6039d7f51a9a648d74db1109c7fdc746.zip
Merge branch 'topic/tlv-chmap' into for-next
This is a merge of a topic branch containing the support for the new channel map API using control elements.
Diffstat (limited to 'net/tipc/net.h')
0 files changed, 0 insertions, 0 deletions