diff options
| author | Francois Romieu <[email protected]> | 2011-04-27 20:52:22 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2011-04-27 20:52:22 +0000 |
| commit | 15ecd039b7182d725f4294e01f2fb12c3a88db17 (patch) | |
| tree | 66ba7a844dacbf061a2aa62396f49640a81213cb /net/ipv4/tcp_ipv4.c | |
| parent | sctp: clean up route lookup calls (diff) | |
| download | kernel-15ecd039b7182d725f4294e01f2fb12c3a88db17.tar.gz kernel-15ecd039b7182d725f4294e01f2fb12c3a88db17.zip | |
r8169: fix merge conflict fix.
- use adequate MAC_VER id
(see 01dc7fec4025f6bb72b6b98ec88b375346b6dbbb)
- remove duplicate rtl_firmware_info record
- remove duplicate functions
Signed-off-by: Francois Romieu <[email protected]>
Cc: Realtek linux nic maintainers <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
0 files changed, 0 insertions, 0 deletions