diff options
| author | Michael Young <m.a.young@durham.ac.uk> | 2010-12-04 17:05:09 +0000 |
|---|---|---|
| committer | Michael Young <m.a.young@durham.ac.uk> | 2010-12-04 17:05:09 +0000 |
| commit | 92830e5e3c70ef01547bfa61b583965a4a12b192 (patch) | |
| tree | f693b5afa80edb751a149aa37c20cd7f3465a5fa | |
| parent | 80cf9562d36e907abebdd7839b79529fee08ad41 (diff) | |
| parent | 22028b11783fb1c0b953c089d73acd291901e182 (diff) | |
| download | dom0-kernel-92830e5e3c70ef01547bfa61b583965a4a12b192.tar.gz dom0-kernel-92830e5e3c70ef01547bfa61b583965a4a12b192.tar.xz dom0-kernel-92830e5e3c70ef01547bfa61b583965a4a12b192.zip | |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
| -rw-r--r-- | kernel.spec | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 2475e25..ce2266c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -48,7 +48,7 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 174.2 +%global baserelease 175 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2233,7 +2233,7 @@ fi * Mon Nov 29 2010 Michael Young <m.a.young@durham.ac.uk> - Another pvops update before F12 reaches EOL -* Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com> +* Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com> 2.6.32.26-175 - netlink-make-nlmsg_find_attr-take-a-const-ptr.patch: quiet build warning the INET_DIAG fix caused. |