From: Linus Torvalds Date: Fri, 30 May 2008 17:20:03 +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=ab8cd81830fef799177740d5ab709c0341e9ba5c;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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: notify on empty virtio: force callback on empty. virtio_blk: fix endianess annotations virtio_config: fix len calculation of config elements virtio_net: another race with virtio_net and enable_cb virtio: An entropy device, as suggested by hpa. virtio_blk: allow read-only disks lguest: fix ugly in /proc/interrupts virtio: set device index in common code. virtio: virtio_pci should not set bus_id. virtio: bus_id for devices should contain 'virtio' Fix crash in virtio_blk during modprobe ; rmmod ; modprobe lguest: use ioremap_cache, not ioremap --- ab8cd81830fef799177740d5ab709c0341e9ba5c