[kernel] r16132 - in dists/sid/linux-2.6/debian: . patches/bugfix/all/stable patches/series

[Ben Hutchings]

Author: benh
Date: Fri Aug 13 22:23:40 2010
New Revision: 16132

Log:
Add relevant changes from stable 2.6.34.4

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.34.4.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/21

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Aug 13 22:22:41 2010	(r16131)
+++ dists/sid/linux-2.6/debian/changelog	Fri Aug 13 22:23:40 2010	(r16132)
@@ -3,6 +3,8 @@
   [ Ben Hutchings ]
   * Add stable 2.6.32.19:
     - Revert ABI change in sched.h
+  * Add relevant changes from stable 2.6.34.4:
+    - rt2870: Add USB ID for Belkin F6D4050 v2
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 12 Aug 2010 23:20:55 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.34.4.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.34.4.patch	Fri Aug 13 22:23:40 2010	(r16132)
@@ -0,0 +1,12 @@
+diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c
+index 2ffd0fe..99ef97a 100644
+--- a/drivers/staging/rt2860/usb_main_dev.c
++++ b/drivers/staging/rt2860/usb_main_dev.c
+@@ -64,6 +64,7 @@ struct usb_device_id rtusb_usb_id[] = {
+ 	{USB_DEVICE(0x14B2, 0x3C07)},	/* AL */
+ 	{USB_DEVICE(0x050D, 0x8053)},	/* Belkin */
+ 	{USB_DEVICE(0x050D, 0x825B)},	/* Belkin */
++	{USB_DEVICE(0x050D, 0x935B)},	/* Belkin F6D4050 v2 */
+ 	{USB_DEVICE(0x14B2, 0x3C23)},	/* Airlink */
+ 	{USB_DEVICE(0x14B2, 0x3C27)},	/* Airlink */
+ 	{USB_DEVICE(0x07AA, 0x002F)},	/* Corega */

Modified: dists/sid/linux-2.6/debian/patches/series/21
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/21	Fri Aug 13 22:22:41 2010	(r16131)
+++ dists/sid/linux-2.6/debian/patches/series/21	Fri Aug 13 22:23:40 2010	(r16132)
@@ -4,3 +4,4 @@
 + debian/fs-buffer.c-Avoid-ABI-change-in-2.6.32.19.patch
 + debian/revert-sched-cputime-Introduce-thread_group_times.patch
 + features/all/USB-option-Use-generic-USB-wwan-code-3.patch
++ bugfix/all/stable/2.6.34.4.patch