Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2013-06-30 21:49:16 -0400
committerJeff Mahoney <jeffm@suse.com>2013-06-30 21:49:16 -0400
commitf080c74e6a74c7b0875ab304d62d2a07af1557a5 (patch)
tree82cc0af2409b1de203b5b38e26dc398407bfc880
parentbfffcd8935afa5dd501676b1ad6cca41159e66c7 (diff)
Update to 3.10-final.
-rw-r--r--config/arm64/default2
-rw-r--r--config/armv7hl/cubox2
-rw-r--r--config/armv7hl/default3
-rw-r--r--config/armv7hl/exynos2
-rw-r--r--config/armv7hl/lpae2
-rw-r--r--config/i386/debug3
-rw-r--r--config/i386/default3
-rw-r--r--config/i386/desktop3
-rw-r--r--config/i386/ec22
-rw-r--r--config/i386/pae3
-rw-r--r--config/i386/trace3
-rw-r--r--config/i386/vanilla5
-rw-r--r--config/i386/xen3
-rw-r--r--config/ppc/default3
-rw-r--r--config/ppc/vanilla5
-rw-r--r--config/ppc64/debug3
-rw-r--r--config/ppc64/default3
-rw-r--r--config/ppc64/trace3
-rw-r--r--config/ppc64/vanilla5
-rw-r--r--config/x86_64/debug3
-rw-r--r--config/x86_64/default3
-rw-r--r--config/x86_64/desktop3
-rw-r--r--config/x86_64/ec22
-rw-r--r--config/x86_64/trace3
-rw-r--r--config/x86_64/vanilla5
-rw-r--r--config/x86_64/xen3
-rw-r--r--rpm/config.sh2
27 files changed, 51 insertions, 31 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 1658a29209..c61b98db18 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 3.10.0-rc7 Kernel Configuration
+# Linux/arm64 3.10.0 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
diff --git a/config/armv7hl/cubox b/config/armv7hl/cubox
index 7c643da54a..672676741d 100644
--- a/config/armv7hl/cubox
+++ b/config/armv7hl/cubox
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.0-rc7 Kernel Configuration
+# Linux/arm 3.10.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_MIGHT_HAVE_PCI=y
diff --git a/config/armv7hl/default b/config/armv7hl/default
index f9bc64106b..438a57c6b5 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.0-rc7 Kernel Configuration
+# Linux/arm 3.10.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -517,6 +517,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_NR_BANKS=8
CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_PJ4B_ERRATA_4742=y
# CONFIG_ARM_ERRATA_430973 is not set
CONFIG_PL310_ERRATA_588369=y
CONFIG_ARM_ERRATA_643719=y
diff --git a/config/armv7hl/exynos b/config/armv7hl/exynos
index c5b1b40d07..2f5055d295 100644
--- a/config/armv7hl/exynos
+++ b/config/armv7hl/exynos
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.0-rc7 Kernel Configuration
+# Linux/arm 3.10.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index c10a1f18a6..3b7a7ff96f 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.0-rc7 Kernel Configuration
+# Linux/arm 3.10.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/config/i386/debug b/config/i386/debug
index a26a05a015..fb8d9fb38a 100644
--- a/config/i386/debug
+++ b/config/i386/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2237,6 +2237,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/i386/default b/config/i386/default
index b761eb09c8..f6592ae4b1 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2233,6 +2233,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/i386/desktop b/config/i386/desktop
index d665b0f13d..940932557a 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2191,6 +2191,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/i386/ec2 b/config/i386/ec2
index 1679f2e9f9..f9c8195c39 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/i386/pae b/config/i386/pae
index 01f46455b7..23a91ac8e1 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2192,6 +2192,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/i386/trace b/config/i386/trace
index bbc26b1fa1..fc6f592a13 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2193,6 +2193,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 58b2eedfc2..2973461bd0 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc6 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2229,6 +2229,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
@@ -4089,6 +4090,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m
#
@@ -4186,7 +4188,6 @@ CONFIG_SOC_CAMERA_OV9640=m
CONFIG_SOC_CAMERA_OV9740=m
CONFIG_SOC_CAMERA_RJ54N1=m
CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
diff --git a/config/i386/xen b/config/i386/xen
index d26d7825e1..a5f7d9bbb8 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.10.0-rc7 Kernel Configuration
+# Linux/i386 3.10.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2017,6 +2017,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/ppc/default b/config/ppc/default
index 137b377969..9c61b73b39 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.0-rc7 Kernel Configuration
+# Linux/powerpc 3.10.0 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -1752,6 +1752,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=y
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 3ca378cd25..d0327bbbc7 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.0-rc6 Kernel Configuration
+# Linux/powerpc 3.10.0 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -1747,6 +1747,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=y
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
@@ -3427,6 +3428,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m
#
@@ -3524,7 +3526,6 @@ CONFIG_SOC_CAMERA_OV9640=m
CONFIG_SOC_CAMERA_OV9740=m
CONFIG_SOC_CAMERA_RJ54N1=m
CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
diff --git a/config/ppc64/debug b/config/ppc64/debug
index b97f848229..732c09fb84 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.0-rc7 Kernel Configuration
+# Linux/powerpc 3.10.0 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1891,6 +1891,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=y
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/ppc64/default b/config/ppc64/default
index a644dc4816..e6ed63a57b 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.0-rc7 Kernel Configuration
+# Linux/powerpc 3.10.0 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1882,6 +1882,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=y
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/ppc64/trace b/config/ppc64/trace
index 9fa816852b..9bbb617ca0 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.0-rc7 Kernel Configuration
+# Linux/powerpc 3.10.0 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1882,6 +1882,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=y
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index a3d3400ce2..baa5e00622 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.10.0-rc6 Kernel Configuration
+# Linux/powerpc 3.10.0 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1875,6 +1875,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=y
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
@@ -3530,6 +3531,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m
#
@@ -3618,7 +3620,6 @@ CONFIG_SOC_CAMERA_OV9640=m
CONFIG_SOC_CAMERA_OV9740=m
CONFIG_SOC_CAMERA_RJ54N1=m
CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 1fff37033a..9b63edc0a3 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc7 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2157,6 +2157,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/x86_64/default b/config/x86_64/default
index 698e837aaf..e05a80bee5 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc7 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2149,6 +2149,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 2f552d4936..c41f6874ca 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc7 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2148,6 +2148,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index ea2be97f70..0fcd451cc6 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc7 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/config/x86_64/trace b/config/x86_64/trace
index e3bc05251f..4a7430c911 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc7 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2150,6 +2150,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 21e5ce9e23..3b8c6e0923 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc6 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -2145,6 +2145,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
@@ -3957,6 +3958,7 @@ CONFIG_SMS_SIANO_RC=y
# Media ancillary drivers (tuners, sensors, i2c, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
CONFIG_VIDEO_IR_I2C=m
#
@@ -4054,7 +4056,6 @@ CONFIG_SOC_CAMERA_OV9640=m
CONFIG_SOC_CAMERA_OV9740=m
CONFIG_SOC_CAMERA_RJ54N1=m
CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_MEDIA_ATTACH=y
CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
diff --git a/config/x86_64/xen b/config/x86_64/xen
index bca0b53fbc..5049310131 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0-rc7 Kernel Configuration
+# Linux/x86_64 3.10.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -1998,6 +1998,7 @@ CONFIG_ATL2=m
CONFIG_ATL1=m
CONFIG_ATL1E=m
CONFIG_ATL1C=m
+CONFIG_ALX=m
CONFIG_NET_CADENCE=y
CONFIG_ARM_AT91_ETHER=m
CONFIG_MACB=m
diff --git a/rpm/config.sh b/rpm/config.sh
index 9c74778123..469907898a 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=3.10-rc7
+SRCVERSION=3.10
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against