From: Linus Torvalds Date: Tue, 29 Jul 2008 01:16:26 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7874d35173d549c1a2b2f77c4b1f94379fa65698;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge git://git./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 --- 7874d35173d549c1a2b2f77c4b1f94379fa65698