fix up some email addresses

6 files changed, 14 insertions, 12 deletions

diff --git a/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch b/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch
index 4cf319a62b..9eadfb6329 100644
--- a/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch
+++ b/queue-2.6.38/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch
@@ -1,9 +1,9 @@
 From 5bfa1063a775836a84f97e4df863fc36e1f856ad Mon Sep 17 00:00:00 2001
-From: "Feng, Boqun" <boqun.feng@intel.com>
+From: Boqun Feng <boqun.feng@intel.com>
 Date: Mon, 16 May 2011 16:02:39 +0800
 Subject: drm/i915: fix user irq miss in BSD ring on g4x
 
-From: "Feng, Boqun" <boqun.feng@intel.com>
+From: Boqun Feng <boqun.feng@intel.com>
 
 commit 5bfa1063a775836a84f97e4df863fc36e1f856ad upstream.
 
@@ -26,7 +26,7 @@ To fix this, as other rings' code do, conditionally call different
 functions(i915_enable/disable_irq and ironlake_enable/disable_irq)
 and use different interrupt flags in bsd_ring_get/put_irq.
 
-Signed-off-by: Feng, Boqun <boqun.feng@intel.com>
+Signed-off-by: Boqun Feng <boqun.feng@intel.com>
 Reviewed-by: Xiang, Haihao <haihao.xiang@intel.com>
 Signed-off-by: Keith Packard <keithp@keithp.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/queue-2.6.38/mtd-return-badblockbits-back.patch b/queue-2.6.38/mtd-return-badblockbits-back.patch
index 6d6b3675b8..ab14ca80e7 100644
--- a/queue-2.6.38/mtd-return-badblockbits-back.patch
+++ b/queue-2.6.38/mtd-return-badblockbits-back.patch
@@ -14,10 +14,10 @@ because otherwise some NAND drivers are broken.
 This problem was reported by "Saxena, Parth <parth.saxena@ti.com>" here:
 http://lists.infradead.org/pipermail/linux-mtd/2011-April/035221.html
 
-Reported-by: Saxena, Parth <parth.saxena@ti.com>
+Reported-by: Parth Saxena <parth.saxena@ti.com>
 Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-Tested-by: Saxena, Parth <parth.saxena@ti.com>
-Acked-by: Saxena, Parth <parth.saxena@ti.com>
+Tested-by: Parth Saxena <parth.saxena@ti.com>
+Acked-by: Parth Saxena <parth.saxena@ti.com>
 Acked-by: Brian Norris <computersforpeace@gmail.com>
 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/queue-2.6.38/series b/queue-2.6.38/series
index 7d619f39a5..64fa937015 100644
--- a/queue-2.6.38/series
+++ b/queue-2.6.38/series
@@ -143,3 +143,4 @@ nfsv4.1-fix-the-handling-of-nfs4err_seq_misordered-errors.patch
 pci-add-quirk-for-setting-valid-class-for-ti816x-endpoint.patch
 xen-mmu-fix-a-race-window-causing-leave_mm-bug.patch
 ext4-use-schedule_timeout_interruptible-for-waiting-in.patch
+apparmor-fix-oops-in-apparmor_setprocattr.patch
diff --git a/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch b/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch
index 0000adf2a5..086d09fe49 100644
--- a/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch
+++ b/queue-2.6.39/drm-i915-fix-user-irq-miss-in-bsd-ring-on-g4x.patch
@@ -1,9 +1,9 @@
 From 5bfa1063a775836a84f97e4df863fc36e1f856ad Mon Sep 17 00:00:00 2001
-From: "Feng, Boqun" <boqun.feng@intel.com>
+From: Boqun Feng <boqun.feng@intel.com>
 Date: Mon, 16 May 2011 16:02:39 +0800
 Subject: drm/i915: fix user irq miss in BSD ring on g4x
 
-From: "Feng, Boqun" <boqun.feng@intel.com>
+From: Boqun Feng <boqun.feng@intel.com>
 
 commit 5bfa1063a775836a84f97e4df863fc36e1f856ad upstream.
 
@@ -26,7 +26,7 @@ To fix this, as other rings' code do, conditionally call different
 functions(i915_enable/disable_irq and ironlake_enable/disable_irq)
 and use different interrupt flags in bsd_ring_get/put_irq.
 
-Signed-off-by: Feng, Boqun <boqun.feng@intel.com>
+Signed-off-by: Boqun Feng <boqun.feng@intel.com>
 Reviewed-by: Xiang, Haihao <haihao.xiang@intel.com>
 Signed-off-by: Keith Packard <keithp@keithp.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/queue-2.6.39/mtd-return-badblockbits-back.patch b/queue-2.6.39/mtd-return-badblockbits-back.patch
index da7cef0b0e..8aa7c6640c 100644
--- a/queue-2.6.39/mtd-return-badblockbits-back.patch
+++ b/queue-2.6.39/mtd-return-badblockbits-back.patch
@@ -14,10 +14,10 @@ because otherwise some NAND drivers are broken.
 This problem was reported by "Saxena, Parth <parth.saxena@ti.com>" here:
 http://lists.infradead.org/pipermail/linux-mtd/2011-April/035221.html
 
-Reported-by: Saxena, Parth <parth.saxena@ti.com>
+Reported-by: Parth Saxena <parth.saxena@ti.com>
 Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-Tested-by: Saxena, Parth <parth.saxena@ti.com>
-Acked-by: Saxena, Parth <parth.saxena@ti.com>
+Tested-by: Parth Saxena <parth.saxena@ti.com>
+Acked-by: Parth Saxena <parth.saxena@ti.com>
 Acked-by: Brian Norris <computersforpeace@gmail.com>
 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/queue-2.6.39/series b/queue-2.6.39/series
index 9f21d6c849..5ea745397f 100644
--- a/queue-2.6.39/series
+++ b/queue-2.6.39/series
@@ -162,3 +162,4 @@ xen-mmu-fix-a-race-window-causing-leave_mm-bug.patch
 block-don-t-block-events-on-excl-write-for-non-optical.patch
 ext4-fix-possible-use-after-free-in.patch
 ext4-use-schedule_timeout_interruptible-for-waiting-in.patch
+apparmor-fix-oops-in-apparmor_setprocattr.patch