summaryrefslogtreecommitdiffstats
path: root/net/netlink
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-12-23 23:13:56 +0100
committerDavid S. Miller <davem@davemloft.net>2011-12-23 23:13:56 +0100
commitabb434cb0539fb355c1c921f8fd761efbbac3462 (patch)
tree24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6 /net/netlink
parentnetem: loss model API sizes (diff)
parentMerge branch 'nf' of git://1984.lsi.us.es/net (diff)
downloadlinux-abb434cb0539fb355c1c921f8fd761efbbac3462.tar.xz
linux-abb434cb0539fb355c1c921f8fd761efbbac3462.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
0 files changed, 0 insertions, 0 deletions