aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan_core.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-30 12:02:22 -0700
committerDavid S. Miller <davem@davemloft.net>2010-09-30 12:02:22 -0700
commit92629195314d8adefabeb78b13d681ad1c01e778 (patch)
treecc84705305a643b391965e4136d07509234ff0e5 /net/8021q/vlan_core.c
parentPhonet: Correct header retrieval after pskb_may_pull (diff)
parentiwl3945: queue the right work if the scan needs to be aborted (diff)
downloadlinux-dev-92629195314d8adefabeb78b13d681ad1c01e778.tar.xz
linux-dev-92629195314d8adefabeb78b13d681ad1c01e778.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/8021q/vlan_core.c')
0 files changed, 0 insertions, 0 deletions