summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-24 08:00:08 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-24 08:00:08 -0500
commit10e2c3572486f54e4ad3420c3ccba2b7a648aaf1 (patch)
tree25241675a25b059ae91b3dfdec5e6419cfdc94a7
parent7f88f481976449a34176e0e6d140504c905f5af9 (diff)
downloadkernel-10e2c3572486f54e4ad3420c3ccba2b7a648aaf1.tar.gz
kernel-10e2c3572486f54e4ad3420c3ccba2b7a648aaf1.tar.xz
kernel-10e2c3572486f54e4ad3420c3ccba2b7a648aaf1.zip
Linux 3.3-rc1-git1 (upstream c1aab02dac690af7ff634d8e1cb3be6a04387eef)
-rw-r--r--config-arm-generic7
-rw-r--r--config-generic1
-rw-r--r--kernel.spec7
-rw-r--r--sources1
4 files changed, 14 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic
index abd9f3c5a..76714a7c5 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -201,3 +201,10 @@ CONFIG_ARM_ERRATA_751472=y
# CONFIG_CS89x0 is not set
# CONFIG_OF_SELFTEST is not set
+# CONFIG_MACH_IMX51_DT is not set
+# CONFIG_MACH_IMX53_DT is not set
+# CONFIG_MACH_MX53_EVK is not set
+# CONFIG_MACH_MX53_SMD is not set
+# CONFIG_MACH_MX53_LOCO is not set
+# CONFIG_MACH_MX53_ARD is not set
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
diff --git a/config-generic b/config-generic
index e49d832dc..1313ef0a5 100644
--- a/config-generic
+++ b/config-generic
@@ -4033,6 +4033,7 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_S3C24XX is not set
CONFIG_LEDS_DELL_NETBOOKS=m
# CONFIG_LEDS_TCA6507 is not set
+# CONFIG_LEDS_OT200 is not set
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
diff --git a/kernel.spec b/kernel.spec
index 44104d47e..9afed693d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 4
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 1
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2276,6 +2276,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Jan 24 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc1.git1.1
+- Linux 3.3-rc1-git1 (upstream c1aab02dac690af7ff634d8e1cb3be6a04387eef)
+
* Mon Jan 23 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc1.git0.4
- Reenable debugging options.
diff --git a/sources b/sources
index 2505de979..efd2b1d5b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz
2fed18362598429cc0669c01123290ff compat-wireless-2012-01-09.tar.bz2
1c3dd34fa219420a4cbed1e573d253e7 patch-3.3-rc1.xz
+a39992f85a392f3a3a515355ad68f889 patch-3.3-rc1-git1.xz