diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-07-14 20:23:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 20:23:54 -0700 |
| commit | 2aec609fb45e84d65bc8eabc7b650bbecb1cc179 (patch) | |
| tree | eb3e8a79604113392d0ee74b19dbc1dfce579c11 /include/linux/fs_stack.h | |
| parent | netfilter: Let nf_ct_kill() callers know if del_timer() returned true. (diff) | |
| parent | ARM: IXP4xx Ethernet NAPI fix (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
Diffstat (limited to 'include/linux/fs_stack.h')
0 files changed, 0 insertions, 0 deletions