corporate2/devel/kernel/default/kernel - Merge from devel/kernel/default/kernel/

[Ozan Çağlayan]

Author: ozan.caglayan
Date: Thu Jan 14 09:50:28 2010
New Revision: 84674

Added:
   corporate2/devel/kernel/default/kernel/files/kernel/linux-2.6-quota-fix-regression-with-ext3.patch
      - copied unchanged from r84673, 2009/devel/kernel/default/kernel/files/kernel/linux-2.6-quota-fix-regression-with-ext3.patch
Modified:
   corporate2/devel/kernel/default/kernel/   (props changed)
   corporate2/devel/kernel/default/kernel/comar/   (props changed)
   corporate2/devel/kernel/default/kernel/files/   (props changed)
   corporate2/devel/kernel/default/kernel/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch
   corporate2/devel/kernel/default/kernel/pspec.xml
Log:
Merge from devel/kernel/default/kernel/:

rev. 84638, by ozan.caglayan on 2010-01-13
What a typo..

rev. 84667, by ozan.caglayan on 2010-01-13
quota: Fix regression on ext3 file-systems causing panic upon boot

BUG:FIXED:12008

---
 files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch |    2 -
 files/kernel/linux-2.6-quota-fix-regression-with-ext3.patch           |   11 ++++++++++
 pspec.xml                                                             |    6 ++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

Modified: corporate2/devel/kernel/default/kernel/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch
=================================================================
--- corporate2/devel/kernel/default/kernel/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch	(original)
+++ corporate2/devel/kernel/default/kernel/files/fastboot/0005-Ordering-kms-after-sata-in-drivers-Makefile.patch	Thu Jan 14 09:50:28 2010
@@ -44,7 +44,7 @@
 +obj-$(CONFIG_FB_I810)           += video/i810/
 +obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 +
-+bj-$(CONFIG_ATM)		+= atm/
++obj-$(CONFIG_ATM)		+= atm/
  obj-$(CONFIG_FUSION)		+= message/
  obj-$(CONFIG_FIREWIRE)		+= firewire/
  obj-y				+= ieee1394/

Modified: corporate2/devel/kernel/default/kernel/pspec.xml
=================================================================
--- corporate2/devel/kernel/default/kernel/pspec.xml	(original)
+++ corporate2/devel/kernel/default/kernel/pspec.xml	Thu Jan 14 09:50:28 2010
@@ -45,6 +45,9 @@
             <Patch level="1">kernel/linux-2.6-atkbd-forced-release-through-sysfs.patch</Patch>
             <Patch level="1">kernel/linux-2.6-atkbd-oqo-forced-release-quirk.patch</Patch>
 
+            <!-- quota: Fix regression on ext3 file-systems causing panic upon boot (#12008) -->
+            <Patch level="1">kernel/linux-2.6-quota-fix-regression-with-ext3.patch</Patch>
+
             <!-- Fix x86 MCE malfunctioning (#11923) -->
             <Patch level="1">kernel/0001-x86-mce-thermal-monitoring-depends-on-APIC-being-enabled.patch</Patch>
             <Patch level="1">kernel/0002-x86-mce-Clean-up-thermal-init-by-introducing-intel_t.patch</Patch>
@@ -431,7 +434,8 @@
                 - Version bump to 2.6.31.11,
                 - Bump TuxOnIce to the latest branch,
                 - Add Realtek staging drivers from 2.6.32 (#11957),
-                - Fix x86 MCE malfunctioning (#11923).
+                - Fix x86 MCE malfunctioning (#11923),
+                - quota: Fix regression on ext3 file-systems causing panic upon boot (#12008).
             </Comment>
             <Name>Ozan Çağlayan</Name>
             <Email>ozan at pardus.org.tr</Email>