Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Sep 2010 18:00:09 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Sep 2010 18:00:09 +0000 (11:00 -0700)
commit4e24db5b1a8fe0b0afab875ad2facdfaedce7b07
treec5e4bfc2ad68885b1c4925d1a65fd8c7a50ad5aa
parentb30a3f6257ed2105259b404d419b4964e363928c
parent9b6efcd2e2275e13403700913b7a1da92cf11ad2
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: update comments to reflect LHCALL_LOAD_GDT_ENTRY.
  virtio: console: Prevent userspace from submitting NULL buffers
  virtio: console: Fix poll blocking even though there is data to read