[APPLIED] Re: Maverick pull request, LP628776, Added be2net, be2scsi to udebs

[Leann Ogasawara]

Applied to Maverick linux master.

Thanks,
Leann

On Thu, 2010-09-02 at 08:12 -0600, Tim Gardner wrote:
> The following changes since commit 9f02aef9921f0f213a6680768641eb2af6113c3b:
>   Leann Ogasawara (1):
>         UBUNTU: Start new release
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/rtg/ubuntu-maverick.git master
> 
> Tim Gardner (1):
>       UBUNTU: [Config] Added be2net, be2scsi to udebs
> 
>  debian.master/d-i/modules/nic-modules  |    1 +
>  debian.master/d-i/modules/scsi-modules |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> From a1d11f0670b75b40381176f75eadee95d103d6b4 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner at canonical.com>
> Date: Thu, 2 Sep 2010 06:47:49 -0600
> Subject: [PATCH] UBUNTU: [Config] Added be2net, be2scsi to udebs
> 
> BugLink: http://bugs.launchpad.net/bugs/628776
> 
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  debian.master/d-i/modules/nic-modules  |    1 +
>  debian.master/d-i/modules/scsi-modules |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules
> index fd2ac6c..a565af3 100644
> --- a/debian.master/d-i/modules/nic-modules
> +++ b/debian.master/d-i/modules/nic-modules
> @@ -32,6 +32,7 @@ atmel_pci ?
>  b44 ?
>  bcm43xx ?
>  bcm43xx-mac80211 ?
> +be2net ?
>  bmac ?
>  bnx2 ?
>  bnx2x ?
> diff --git a/debian.master/d-i/modules/scsi-modules b/debian.master/d-i/modules/scsi-modules
> index 6b872b9..f4050e4 100644
> --- a/debian.master/d-i/modules/scsi-modules
> +++ b/debian.master/d-i/modules/scsi-modules
> @@ -114,3 +114,4 @@ qla4xxx ?
>  mvsas ?
>  vmw_pvscsi ?
>  ums-cypress ?
> +be2scsi ?