diff options
| author | David S. Miller | 2009-11-06 09:55:55 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-11-06 09:55:55 +0100 |
| commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
| tree | 9d2690917533bbb4498c8c9df838de2d38360912 /net/socket.c | |
| parent | net: Fix build warning in sock_bindtodevice(). (diff) | |
| parent | decnet: netdevice refcount leak (diff) | |
| download | kernel-qcow2-linux-230f9bb701d37ae9b48e96456689452978f5c439.tar.gz kernel-qcow2-linux-230f9bb701d37ae9b48e96456689452978f5c439.tar.xz kernel-qcow2-linux-230f9bb701d37ae9b48e96456689452978f5c439.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/usb/cdc_ether.c
All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions