diff options
author | David S. Miller <davem@davemloft.net> | 2009-04-16 16:32:29 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-16 16:32:29 -0700 |
commit | 134ffb4cad92a6aa534e55a9be145bca780a32c1 (patch) | |
tree | be2b312eefbe4b38e81efb384fda4d8fdfae9943 /net/8021q/vlan_core.c | |
parent | ixgbe: Be explict with what we are !'ing in ixgbe_sfp_config_module_task() (diff) | |
parent | netfilter: nf_nat: add support for persistent mappings (diff) | |
download | linux-dev-134ffb4cad92a6aa534e55a9be145bca780a32c1.tar.xz linux-dev-134ffb4cad92a6aa534e55a9be145bca780a32c1.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/8021q/vlan_core.c')
0 files changed, 0 insertions, 0 deletions