From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 27 Jan 2010 00:02:37 +0000 (-0800)
Subject: fix an email address and delete a ata_piix patch
X-Git-Tag: v2.6.32.7~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba04982ac1008ad6280d3425226c5cf604e9e931;p=thirdparty%2Fkernel%2Fstable-queue.git

fix an email address and delete a ata_piix patch
---

diff --git a/queue-2.6.32/ata_piix-enable-32bit-pio-on-sata-piix.patch b/queue-2.6.32/ata_piix-enable-32bit-pio-on-sata-piix.patch
deleted file mode 100644
index f7d4f001c6c..00000000000
--- a/queue-2.6.32/ata_piix-enable-32bit-pio-on-sata-piix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0b67c7439fe2a5d76602de36854c88e2beab00b0 Mon Sep 17 00:00:00 2001
-From: Tejun Heo <tj@kernel.org>
-Date: Mon, 11 Jan 2010 17:03:11 +0900
-Subject: ata_piix: enable 32bit PIO on SATA piix
-
-From: Tejun Heo <tj@kernel.org>
-
-commit 0b67c7439fe2a5d76602de36854c88e2beab00b0 upstream.
-
-Commit 871af1210f13966ab911ed2166e4ab2ce775b99d enabled 32bit PIO for
-PATA piix but didn't for SATA.  There's no reason not to use 32bit PIO
-on SATA piix.  Enable it.
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/ata/ata_piix.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/ata/ata_piix.c
-+++ b/drivers/ata/ata_piix.c
-@@ -329,7 +329,7 @@ static struct ata_port_operations ich_pa
- };
- 
- static struct ata_port_operations piix_sata_ops = {
--	.inherits		= &ata_bmdma_port_ops,
-+	.inherits		= &ata_bmdma32_port_ops,
- };
- 
- static struct ata_port_operations piix_sidpr_sata_ops = {
diff --git a/queue-2.6.32/pci-aer-fix-aer-inject-result-in-kernel-oops.patch b/queue-2.6.32/pci-aer-fix-aer-inject-result-in-kernel-oops.patch
index f85f4a4b393..704e99fd9de 100644
--- a/queue-2.6.32/pci-aer-fix-aer-inject-result-in-kernel-oops.patch
+++ b/queue-2.6.32/pci-aer-fix-aer-inject-result-in-kernel-oops.patch
@@ -1,9 +1,9 @@
 From 46256f83d0d066f99ffde547f27473dfd2a78009 Mon Sep 17 00:00:00 2001
-From: Youquan,Song <youquan.song@linux.intel.com>
+From: Song Youquan <youquan.song@linux.intel.com>
 Date: Fri, 11 Dec 2009 18:42:35 -0500
 Subject: PCI: AER: fix aer inject result in kernel oops
 
-From: Youquan,Song <youquan.song@linux.intel.com>
+From: Song Youquan <youquan.song@linux.intel.com>
 
 commit 46256f83d0d066f99ffde547f27473dfd2a78009 upstream.
 
@@ -45,8 +45,8 @@ CR2: 0000000000000350
 
 So check the _OSC before assuming that AER is available to the OS.
 
-Signed-off-by: Youquan, Song <youquan.song@intel.com>
-Acked-by: Ying, Huang <ying.huang@intel.com>
+Signed-off-by: Song Youquan <youquan.song@intel.com>
+Acked-by: Huang Ying <ying.huang@intel.com>
 Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
 Signed-off-by: Thomas Renninger <trenn@suse.de>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 3f0df3df8d9..80c64beda90 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -69,7 +69,6 @@ itco_wdt-add-pci-id-for-the-intel-ep80579-tolapai-soc.patch
 itco_wdt-add-intel-cougar-point-and-pch-deviceids.patch
 ahci-disable-snotification-capability-for-ich8.patch
 ata_piix-fix-mwdma-handling-on-piix3.patch
-ata_piix-enable-32bit-pio-on-sata-piix.patch
 md-fix-small-irregularity-with-start_ro-module-parameter.patch
 v4l-dvb-13826-uvcvideo-fix-controls-blacklisting.patch
 cio-fix-double-free-in-case-of-probe-failure.patch