APPLIED: [PATCH v2 0/4][Xenial SRU] UBUNTU: SAUCE: Support latest Redpine WLAN/BT RS9113 driver

[Luis Henriques]

Applied to xenial master-next branch.  Added an extra patch (see below) to
address reviewers comments.

Cheers,
--
Luís

>From 508f695b636c91de213b3eeaad2d45f302b45349 Mon Sep 17 00:00:00 2001
From: Luis Henriques <luis.henriques at canonical.com>
Date: Fri, 20 Jan 2017 15:15:11 +0000
Subject: [PATCH] UBUNTU: SAUCE: RS9113: Comment out IDs from upstream driver

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

Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +-
 drivers/net/wireless/rsi/rsi_91x_usb.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c
index 8428858204a6..e3b8d7e7bdb5 100644
--- a/drivers/net/wireless/rsi/rsi_91x_sdio.c
+++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c
@@ -796,7 +796,7 @@ static const struct sdio_device_id rsi_dev_table[] =  {
 	{ SDIO_DEVICE(0x303, 0x100) },
 	{ SDIO_DEVICE(0x041B, 0x0301) },
 	{ SDIO_DEVICE(0x041B, 0x0201) },
-	{ SDIO_DEVICE(0x041B, 0x9330) },
+	/* { SDIO_DEVICE(0x041B, 0x9330) }, LP:#1657682 replaced by ubuntu/rsi/ */
 	{ /* Blank */},
 };
 
diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index ef5d394f185b..dd2030558084 100644
--- a/drivers/net/wireless/rsi/rsi_91x_usb.c
+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
@@ -553,7 +553,7 @@ static const struct usb_device_id rsi_dev_table[] = {
 	{ USB_DEVICE(0x0303, 0x0100) },
 	{ USB_DEVICE(0x041B, 0x0301) },
 	{ USB_DEVICE(0x041B, 0x0201) },
-	{ USB_DEVICE(0x041B, 0x9330) },
+	/* { USB_DEVICE(0x041B, 0x9330) }, LP:#1657682 replaced by ubuntu/rsi/ */
 	{ /* Blank */},
 };