From: Linus Torvalds Date: Fri, 22 Jul 2011 20:45:50 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Tag: firefly_0821_release~3680^2~5009 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a7e1aabb28e8154ce987b622fd78d80a1ca39361;p=firefly-linux-kernel-4.4.55.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: Fix in/out emulation lguest: Fix translation count about wikipedia's cpuid page lguest: Fix three simple typos in comments lguest: update comments lguest: Simplify device initialization. lguest: don't rewrite vmcall instructions lguest: remove remaining vmcall lguest: use a special 1:1 linear pagetable mode until first switch. lguest: Do not exit on non-fatal errors --- a7e1aabb28e8154ce987b622fd78d80a1ca39361