From: Linus Torvalds <torvalds@linux-foundation.org>
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-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a7e1aabb28e8154ce987b622fd78d80a1ca39361;p=openwrt%2Fstaging%2Fblogic.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