From f0c7b02e37624a193b93e6d76e349e7431557a6c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 21 Jun 2016 19:45:18 +0100
Subject: [PATCH] tools: Update rebase script with additional rtl8192cu commits
 we need to drop

---
 tools/RPi/gen-rpi-linux-patch.sh |  3 +++
 tools/RPi/rpi-linux-rebase.sh    | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/tools/RPi/gen-rpi-linux-patch.sh b/tools/RPi/gen-rpi-linux-patch.sh
index 94b095455b..07288b61b8 100755
--- a/tools/RPi/gen-rpi-linux-patch.sh
+++ b/tools/RPi/gen-rpi-linux-patch.sh
@@ -55,6 +55,9 @@ if [ -z "${KERNEL}" ]; then
   git remote add -t linux-${BRANCH}.y linux-stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
 fi
 
+# Apply the following config change to reduce chance of duplicate hashes
+git config --local core.abbrev 40 
+
 git fetch --all --depth=${DEPTH}
 git reset --hard origin/rpi-${BRANCH}.y${REBASE}
 
diff --git a/tools/RPi/rpi-linux-rebase.sh b/tools/RPi/rpi-linux-rebase.sh
index 51ace90198..6f60186ebb 100755
--- a/tools/RPi/rpi-linux-rebase.sh
+++ b/tools/RPi/rpi-linux-rebase.sh
@@ -3,6 +3,7 @@
 # Setup:
 # git clone -b rpi-4.4.y --depth=1000 --single-branch git@github.com:raspberrypi/linux.git raspberrypi-linux
 # git remote add -t linux-4.4.y linux-stable git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+# git config --local core.abbrev 40
 # Update:
 # git fetch --all --depth=1000
 # git reset --hard origin/rpi-4.4.y
@@ -19,6 +20,17 @@ rtl8192cu\: Add PID for D-Link DWA 131
 Added Device IDs for August DVB-T 205
 net\: Add non-mainline source for rtl8192cu wlan
 net\: Fix rtl8192cu build errors on other platforms
+Enable cfg80211 support
+suppress spurious messages
+Add #if for 3\.14 kernel change \(#87\)
+Set dev_type to wlan
+Tentatively added support for more 8188CUS based devices\.
+Add support for more 8188CUS and 8192CUS devices
+Add ProductId for the Netgear N150 - WNA1000M
+Fixes CONFIG_CONCURRENT_MODE CONFIG_MULTI_VIR_IFACES
+Fixes compatibility with 3\.13
+Enables warning in the compiler and fixes some issues, reference => https\:\/\/github\.com\/diederikdehaas\/rtl8812AU
+Starts device in station mode instead of monitor, fixes NetworkManager issues
 "
 
 IFS=$'\n'