diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-02-21 14:32:16 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-02-21 14:32:23 -0500 |
| commit | 292a6915db21e6582e5a0d09a17aa60d04d5157a (patch) | |
| tree | 8e2b88bef9244241edc193d6e2d44d18dd084458 /kernel.spec | |
| parent | 73a9923d68b217d78c29a5e8f21fa1786401510d (diff) | |
| download | kernel-292a6915db21e6582e5a0d09a17aa60d04d5157a.tar.gz kernel-292a6915db21e6582e5a0d09a17aa60d04d5157a.tar.xz kernel-292a6915db21e6582e5a0d09a17aa60d04d5157a.zip | |
imon: don't wedge hardware after early callbacks (rhbz 781832)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index 47f21ecdb..3bb9f1a58 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 2 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -714,6 +714,7 @@ Patch2802: linux-2.6-silence-acpi-blacklist.patch Patch2899: linux-2.6-v4l-dvb-fixes.patch Patch2900: linux-2.6-v4l-dvb-update.patch Patch2901: linux-2.6-v4l-dvb-experimental.patch +Patch2902: imon-dont-wedge-hardware-after-early-callbacks.patch # fs fixes @@ -1444,6 +1445,7 @@ ApplyPatch quite-apm.patch ApplyOptionalPatch linux-2.6-v4l-dvb-fixes.patch ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch +ApplyPatch imon-dont-wedge-hardware-after-early-callbacks.patch # Patches headed upstream ApplyPatch disable-i8042-check-on-apple-mac.patch @@ -2365,6 +2367,9 @@ fi # ||----w | # || || %changelog +* Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> +- imon: don't wedge hardware after early callbacks (rhbz 781832) + * Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc4.git1.2 - Enable rtl8712 driver (rhbz 699618) - Linux 3.3-rc4-git1 (upstream 27e74da9800289e69ba907777df1e2085231eff7) |