drop acpi-fix-null-deref for now, since it's not yet upstream

diff --git a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch b/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
deleted file mode 100644 (file)
index aaaeded..0000000
--- a/queue/acpi-fix-null-deref-in-video-lcd-brightness.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From stable-bounces@linux.kernel.org Sat Nov 19 15:41:57 2005
-Message-Id: <200511192354.jAJNs0Aw015608@shell0.pdx.osdl.net>
-To: luming.yu@gmail.com, len.brown@intel.com, nacc@us.ibm.com, stable@kernel.org, trenn@suse.de, mm-commits@vger.kernel.org
-From: akpm@osdl.org
-Date: Sat, 19 Nov 2005 15:53:56 -0800
-Cc: 
-Subject: apci: fix NULL deref in video/lcd/brightness
-
-From: Yu Luming <luming.yu@gmail.com>
-
-Fix Null pointer deref in video/lcd/brightness
-http://bugzilla.kernel.org/show_bug.cgi?id=5571
-
-Signed-off-by: Yu Luming <luming.yu@gmail.com>
-Cc: "Brown, Len" <len.brown@intel.com>
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
-Signed-off-by: Andrew Morton <akpm@osdl.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/acpi/video.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- linux-2.6.14.2.orig/drivers/acpi/video.c
-+++ linux-2.6.14.2/drivers/acpi/video.c
-@@ -813,7 +813,7 @@ acpi_video_device_write_brightness(struc
- 
-       ACPI_FUNCTION_TRACE("acpi_video_device_write_brightness");
- 
--      if (!dev || count + 1 > sizeof str)
-+      if (!dev || !dev->brightness || count + 1 > sizeof str)
-               return_VALUE(-EINVAL);
- 
-       if (copy_from_user(str, buffer, count))

diff --git a/queue/series b/queue/series
index 89b08cecc943b99df0dd492b1f7eeb9ec2ee2f49..537669f4c1adefb2d95b613a8d03a48c918664ec 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -17,7 +17,6 @@ fix-memory-management-error-during.patch
 fix-calculation-of-ah-length-during.patch
 fix-sending-extension-headers-before.patch
 4GB-memory-intel-dual-core.patch
-acpi-fix-null-deref-in-video-lcd-brightness.patch
 drivers-isdn-hardware-eicon-os_4bri.c-correct-the-xdiloadfile-signature.patch
 hwmon-w83627hf-missing-in0-limit-check.patch
 hwmon-lm78-fix-vid.patch