diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-06 07:54:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-06 07:54:40 +0100 |
| commit | 730c30ec646bd252a9448a66ecd51d794853513f (patch) | |
| tree | c0d413860f9d8bf37374f17cfabb4911143465d7 /net/ipv4/syncookies.c | |
| parent | tcp: move some parts from tcp_write_xmit (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-730c30ec646bd252a9448a66ecd51d794853513f.tar.xz linux-730c30ec646bd252a9448a66ecd51d794853513f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c
Diffstat (limited to 'net/ipv4/syncookies.c')
0 files changed, 0 insertions, 0 deletions