diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-02-23 20:22:53 -0500 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2011-02-23 20:22:53 -0500 |
| commit | 133f001fc7352d46551dc08d45ea896e15dfd15c (patch) | |
| tree | a850bc45b8c6f5079fba80f3ff3052dab9aec311 /kernel.spec | |
| parent | d7c7c8a11496ea03c199e7c51d438962386592da (diff) | |
| parent | a8bce03c83bc3dd3238bd40a7633a7653a1e9251 (diff) | |
| download | kernel-133f001fc7352d46551dc08d45ea896e15dfd15c.tar.gz kernel-133f001fc7352d46551dc08d45ea896e15dfd15c.tar.xz kernel-133f001fc7352d46551dc08d45ea896e15dfd15c.zip | |
Merge branch 'f15/master'
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index b03adf0f2..d5c04d6d5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -733,9 +733,6 @@ Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch Patch12438: ath5k-fix-fast-channel-change.patch -# rhbz#676860 -Patch12441: usb-sierra-add-airprime-direct-ip.patch - %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1351,9 +1348,6 @@ ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch # rhbz#672778 ApplyPatch ath5k-fix-fast-channel-change.patch -# rhbz#676860 -ApplyPatch usb-sierra-add-airprime-direct-ip.patch - # END OF PATCH APPLICATIONS %endif @@ -1957,6 +1951,12 @@ fi # and build. %changelog +* Wed Feb 23 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc6.git2.1 +- Linux 2.6.38-rc6-git2 + +* Wed Feb 23 2011 Ben Skeggs <bskeggs@redhat.com> 2.6.38-0.rc6.git0.2 +- nouveau: nv4x pciegart fixes, nvc0 accel improvements + * Tue Feb 22 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38-0.rc6.git0.1 - Linux 2.6.38-rc6 |