aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 12:44:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 12:44:41 -0800
commita5bbef0b2deb7b943f095181309ecc9e1fc91c0f (patch)
treea64e846b183cb98ce34eb8c32258466639274bed /net/ipv4/ip_gre.c
parentMerge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff)
parentxen: suspend and resume system devices when running PVHVM (diff)
downloadlinux-dev-a5bbef0b2deb7b943f095181309ecc9e1fc91c0f.tar.xz
linux-dev-a5bbef0b2deb7b943f095181309ecc9e1fc91c0f.zip
Merge branch 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6
* 'for-linus/bugfixes' of git://xenbits.xen.org/people/ianc/linux-2.6: xen: suspend and resume system devices when running PVHVM
Diffstat (limited to 'net/ipv4/ip_gre.c')
0 files changed, 0 insertions, 0 deletions