diff options
| author | David S. Miller <[email protected]> | 2011-12-23 22:13:56 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2011-12-23 22:13:56 +0000 |
| commit | abb434cb0539fb355c1c921f8fd761efbbac3462 (patch) | |
| tree | 24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6 /net/unix/diag.c | |
| parent | netem: loss model API sizes (diff) | |
| parent | Merge branch 'nf' of git://1984.lsi.us.es/net (diff) | |
| download | kernel-abb434cb0539fb355c1c921f8fd761efbbac3462.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'net/unix/diag.c')
0 files changed, 0 insertions, 0 deletions