diff options
| author | Dave Jones <davej@redhat.com> | 2010-07-29 23:22:07 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2010-07-29 23:22:07 -0400 |
| commit | b0b1257905b069750aa086cf255878907f47567d (patch) | |
| tree | 1fe0b803a6cb722bfac4b2a013b086977442078c | |
| parent | 11487c5358c414c73bcfd9c850d469fba081f18c (diff) | |
| download | kernel-b0b1257905b069750aa086cf255878907f47567d.tar.gz kernel-b0b1257905b069750aa086cf255878907f47567d.tar.xz kernel-b0b1257905b069750aa086cf255878907f47567d.zip | |
rebase to 2.6.35-rc6-git5
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 7ad97c908..f52187036 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ linux-2.6.34.tar.bz2 -patch-2.6.35-rc6-git1.bz2 patch-2.6.35-rc6.bz2 +patch-2.6.35-rc6-git5.bz2 diff --git a/kernel.spec b/kernel.spec index 21f34bc10..f4bd69259 100644 --- a/kernel.spec +++ b/kernel.spec @@ -81,7 +81,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 6 # The git snapshot level -%define gitrev 1 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1864,6 +1864,9 @@ fi # || || %changelog +* Thu Jul 29 2010 Dave Jones <davej@redhat.com> +- 2.6.35-rc6-git5 + * Mon Jul 27 2010 Kyle McMartin <kyle@redhat.com> - Patch from linville to only use the country code to set band limits. (Fixes Apple Airport base stations from limiting you from associating @@ -1,3 +1,3 @@ 10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 -ec36a4c6878e4638e2a78a317fef280d patch-2.6.35-rc6-git1.bz2 1205481c8d1b5ccecad87840ddaeaf81 patch-2.6.35-rc6.bz2 +6488f89f618d7e03af865534b31d3419 patch-2.6.35-rc6-git5.bz2 |