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:
  move virtrng_remove to .devexit.text
  move virtballoon_remove to .devexit.text
  virtio_blk: Revert serial number support
  virtio: let header files include virtio_ids.h
  virtio_blk: revert QUEUE_FLAG_VIRT addition

diff --combined drivers/net/virtio_net.c
index 54bf091,50ac94c..3709d6a
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -22,7 -22,6 +22,6 @@@
  #include <linux/ethtool.h>
  #include <linux/module.h>
  #include <linux/virtio.h>
- #include <linux/virtio_ids.h>
  #include <linux/virtio_net.h>
  #include <linux/scatterlist.h>
  #include <linux/if_vlan.h>
@@@ -454,7 -453,7 +453,7 @@@ static unsigned int free_old_xmit_skbs(
                vi->dev->stats.tx_bytes += skb->len;
                vi->dev->stats.tx_packets++;
                tot_sgs += skb_vnet_hdr(skb)->num_sg;
 -              kfree_skb(skb);
 +              dev_kfree_skb_any(skb);
        }
        return tot_sgs;
  }