aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-01 18:00:57 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-01 18:00:57 -0800
commit01f7d91d01716b93c7a4a97312161c99ba57820f (patch)
tree3f7843e8432805d1aee2cf10c1e2bfc79b936a03
parenta869fa7c41c7c866661d58902ca6fac15e1e1498 (diff)
downloadpatches-01f7d91d01716b93c7a4a97312161c99ba57820f.tar.gz
2.6.28 refresh
-rw-r--r--usb/usb-storage-make-the-quirks-module-parameter-writable.patch2
-rw-r--r--usb/usb-usb-storage-add-quirks-module-parameter.patch2
-rw-r--r--version2
3 files changed, 3 insertions, 3 deletions
diff --git a/usb/usb-storage-make-the-quirks-module-parameter-writable.patch b/usb/usb-storage-make-the-quirks-module-parameter-writable.patch
index c6611bfff644dd..53ea4dbf4e237f 100644
--- a/usb/usb-storage-make-the-quirks-module-parameter-writable.patch
+++ b/usb/usb-storage-make-the-quirks-module-parameter-writable.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -2324,14 +2324,21 @@ and is between 256 and 4096 characters.
+@@ -2327,14 +2327,21 @@ and is between 256 and 4096 characters.
and Product ID values (4-digit hex numbers) and
Flags is a set of characters, each corresponding
to a common usb-storage quirk flag as follows:
diff --git a/usb/usb-usb-storage-add-quirks-module-parameter.patch b/usb/usb-usb-storage-add-quirks-module-parameter.patch
index 8fd7e5ce8776f7..0075c0142fb60d 100644
--- a/usb/usb-usb-storage-add-quirks-module-parameter.patch
+++ b/usb/usb-usb-storage-add-quirks-module-parameter.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
USB USB support is enabled.
USBHID USB Human Interface Device support is enabled.
V4L Video For Linux support is enabled.
-@@ -2311,6 +2312,34 @@ and is between 256 and 4096 characters.
+@@ -2314,6 +2315,34 @@ and is between 256 and 4096 characters.
usbhid.mousepoll=
[USBHID] The interval which mice are to be polled at.
diff --git a/version b/version
index 35b858cbc03495..32b932e89a0f44 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.28-rc9
+2.6.28