diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-06 03:55:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-06 03:55:55 -0500 |
| commit | 230f9bb701d37ae9b48e96456689452978f5c439 (patch) | |
| tree | 9d2690917533bbb4498c8c9df838de2d38360912 /net/wireless/mlme.c | |
| parent | 000ba2e43f33901859fd794bb33c885909d53b3b (diff) | |
| parent | 887e671f324d9898aaedb29a6ece6c853c394067 (diff) | |
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/wireless/mlme.c')
0 files changed, 0 insertions, 0 deletions