From: Linus Torvalds Date: Tue, 21 Sep 2010 18:00:09 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4e24db5b1a8fe0b0afab875ad2facdfaedce7b07;p=linux-beck.git 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: 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 --- 4e24db5b1a8fe0b0afab875ad2facdfaedce7b07