diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-26 15:16:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-26 15:16:46 -0400 |
| commit | 2bd93d7af1581d40e3c4b25242472661cb7c637a (patch) | |
| tree | 43c638422d20857339d8d908d6b65ebb8045edc0 /drivers/net/bnx2x/bnx2x.h | |
| parent | 64cad2ade1e6f890531a58318ca9ee013f92ef2f (diff) | |
| parent | 0972ddb2373d5e127aabdcabd8305eff0242cd0b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
0 files changed, 0 insertions, 0 deletions