diff options
author | Linaro CI <john.rigby@linaro.org> | 2012-01-23 09:22:48 -0700 |
---|---|---|
committer | Linaro CI <john.rigby@linaro.org> | 2012-02-07 22:54:11 +0000 |
commit | 50e5780c779bdaf71ccd6698c9749548258af751 (patch) | |
tree | 65cf6d814db7ec57ae7be1c77499bf056f1f074b | |
parent | 3577e0f19bde267926307cf328fb2073cb2bbd9d (diff) |
linux-linaro 3.1.0-10.10~ci~20120123091533
created from:
tree:git://git.linaro.org/kernel/linux-linaro-3.1.git
branch:master
commit:2150f72fe35397cc6d6ce39866bd0462cfbcc916
tree:git://kernel.ubuntu.com/ubuntu/ubuntu-precise.git
branch:latest tagged release based on upstream v3.1
commit:77ca5283a120d01aa4e7926788b52ec93c7dfa17
tree:git://git.linaro.org/ubuntu/linux-linaro-precise.git
branch:master
commit:bd5b3ed4a9ed110538b4eb33fe2b873b9cd254c1
upstream-commit-hash=2150f72fe35397cc6d6ce39866bd0462cfbcc916
commit 2150f72fe35397cc6d6ce39866bd0462cfbcc916
Author: Will Deacon <will.deacon@arm.com>
Date: Fri Dec 2 18:16:01 2011 +0100
ARM: 7185/1: perf: don't assign platform_device on unsupported CPUs
In the unlikely case that a platform registers a PMU platform_device
when running on a CPU that is unsupported by perf, we will encounter a
NULL dereference when trying to assign the platform_device to the
cpu_pmu structure.
This patch checks that the CPU is supported by perf before assigning
the platform_device.
Reported-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
(cherry picked from commit 6bd054096dce061560cee0e016e292e588dc438f)
ubuntu-sauce-commit-hash=77ca5283a120d01aa4e7926788b52ec93c7dfa17
commit 77ca5283a120d01aa4e7926788b52ec93c7dfa17
Author: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri Oct 28 12:49:09 2011 -0700
UBUNTU: Ubuntu-3.1.0-2.3
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
linaro-sauce-commit-hash=bd5b3ed4a9ed110538b4eb33fe2b873b9cd254c1
commit bd5b3ed4a9ed110538b4eb33fe2b873b9cd254c1
Author: John Rigby <john.rigby@linaro.org>
Date: Sun Jan 22 23:54:54 2012 -0700
Linaro 3.1.0-8.8
Signed-off-by: John Rigby <john.rigby@linaro.org>
Signed-off-by: Linaro CI <john.rigby@linaro.org>
-rw-r--r-- | debian.linaro/changelog | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog index 0a9276906e8..c3f63685096 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -1,7 +1,18 @@ -linux-linaro (3.1.0-10.10~ci~20120123091533) UNRELEASED; urgency=low +linux-linaro (3.1.0-10.10~ci~20120123091533) oneiric; urgency=low * LINARO: CI: Autogenerated Continuous Integration Build * Rebase on new upstreams + * linux-linaro 3.1.0-10.10~ci~20120123091533 + created from: + tree:git://git.linaro.org/kernel/linux-linaro-3.1.git + branch:master + commit:2150f72fe35397cc6d6ce39866bd0462cfbcc916 + tree:git://kernel.ubuntu.com/ubuntu/ubuntu-precise.git + branch:latest tagged release based on upstream v3.1 + commit:77ca5283a120d01aa4e7926788b52ec93c7dfa17 + tree:git://git.linaro.org/ubuntu/linux-linaro-precise.git + branch:master + commit:bd5b3ed4a9ed110538b4eb33fe2b873b9cd254c1 -- Linaro CI <john.rigby@linaro.org> Mon, 23 Jan 2012 09:22:31 -0700 |