Lucid request-pull, lp531017

[Tim Gardner]

The following changes since commit ac5d9f160c0c615578f3fc563666b8efece04027:
  Andy Whitcroft (1):
        UBUNTU: Ubuntu-2.6.32-16.25

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-lucid.git lp531017

Tim Gardner (1):
      UBUNTU: [Config] Add vmw_pvscsi and vmxnet3 to -virtual flavour

 debian.master/sub-flavours/virtual.list |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

>From e3c8e8fb569a2584b8985b77a5a449e48228d42e Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Wed, 10 Mar 2010 11:20:21 -0700
Subject: [PATCH] UBUNTU: [Config] Add vmw_pvscsi and vmxnet3 to -virtual flavour

BugLink: http://bugs.launchpad.net/bugs/531017

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/sub-flavours/virtual.list |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/debian.master/sub-flavours/virtual.list b/debian.master/sub-flavours/virtual.list
index f5cf14d..26b1c24 100644
--- a/debian.master/sub-flavours/virtual.list
+++ b/debian.master/sub-flavours/virtual.list
@@ -53,6 +53,7 @@ drivers/net/slhc.ko
 drivers/net/slip.ko
 drivers/net/tun.ko
 drivers/net/veth.ko
+drivers/net/vmxnet3/vmxnet3.ko
 drivers/net/xen-netfront.ko
 drivers/parport/parport.ko
 drivers/parport/parport_pc.ko
@@ -74,6 +75,7 @@ drivers/scsi/scsi_wait_scan.ko
 drivers/scsi/sd_mod.ko
 drivers/scsi/sg.ko
 drivers/scsi/sr_mod.ko
+drivers/scsi/vmw_pvscsi.ko
 drivers/usb/core/usbcore.ko
 drivers/usb/storage/usb-storage.ko
 drivers/video/cirrusfb.ko
-- 
1.7.0