diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-12 18:58:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-12 18:58:40 -0800 |
| commit | 464143c911df98d4913932534485113a0a14aa74 (patch) | |
| tree | 4df3953e3cbba8931b6305aa6d16981f1a93de6c /scripts/patch-kernel | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| parent | netfilter: fix compilation when conntrack is disabled but tproxy is enabled (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions