summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_user.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 18:16:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 18:16:26 -0700
commit7874d35173d549c1a2b2f77c4b1f94379fa65698 (patch)
tree995aa7212619dbdebb43b124cae2378562dd3065 /net/xfrm/xfrm_user.c
parent5dfb66ba8c4a96eb732942c9f78629e4db1a51d4 (diff)
parent8c79873da0d2bedf4ad6b868c54e426bb0a2fe38 (diff)
downloadlinux-7874d35173d549c1a2b2f77c4b1f94379fa65698.tar.gz
linux-7874d35173d549c1a2b2f77c4b1f94379fa65698.tar.bz2
linux-7874d35173d549c1a2b2f77c4b1f94379fa65698.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: lguest: turn Waker into a thread, not a process lguest: Enlarge virtio rings lguest: Use GSO/IFF_VNET_HDR extensions on tun/tap lguest: Remove 'network: no dma buffer!' warning lguest: Adaptive timeout lguest: Tell Guest net not to notify us on every packet xmit lguest: net block unneeded receive queue update notifications lguest: wrap last_avail accesses. lguest: use cpu capability accessors lguest: virtio-rng support lguest: Support assigning a MAC address lguest: Don't leak /dev/zero fd lguest: fix verbose printing of device features. lguest: fix switcher_page leak on unload lguest: Guest int3 fix lguest: set max_pfn_mapped, growl loudly at Yinghai Lu
Diffstat (limited to 'net/xfrm/xfrm_user.c')
0 files changed, 0 insertions, 0 deletions