diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-23 13:08:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-23 13:08:24 +0200 |
| commit | 5802b140ed52957ad150eaf40239a95f5f45fbd3 (patch) | |
| tree | e5c37962611bc5f39c56a1ec479b9059072f056a /drivers/net/bnx2.h | |
| parent | af_iucv: New socket option for setting IUCV MSGLIMITs (diff) | |
| parent | netfilter: ctnetlink: fix gcc warning during compilation (diff) | |
| download | linux-5802b140ed52957ad150eaf40239a95f5f45fbd3.tar.xz linux-5802b140ed52957ad150eaf40239a95f5f45fbd3.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/iucv/af_iucv.c
Diffstat (limited to 'drivers/net/bnx2.h')
0 files changed, 0 insertions, 0 deletions