summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-12 23:41:02 +0100
committerDavid S. Miller <davem@davemloft.net>2011-03-12 23:41:02 +0100
commit1561747ddf9d28185548687b11aae7074d6129c4 (patch)
tree7d0561b6fd8e5f6e6f30e49142213bfb348be5ac /net/ipv4/ip_gre.c
parentMerge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff)
parentixgbe: DCB, PFC not cleared until reset occurs (diff)
downloadlinux-1561747ddf9d28185548687b11aae7074d6129c4.tar.xz
linux-1561747ddf9d28185548687b11aae7074d6129c4.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'net/ipv4/ip_gre.c')
0 files changed, 0 insertions, 0 deletions