diff options
| author | Linaro CI <john.rigby@linaro.org> | 2011-12-15 23:41:27 +0000 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-03-20 23:28:11 -0600 |
| commit | c712fca36f71655ebb91569ac1f6b20280e77afb (patch) | |
| tree | 19539f7b55256df9862441782a75012cac45d316 | |
| parent | e2af2a04dd7760290e0fccde3f8f86533aa5840a (diff) | |
linux-linaro 3.1.0-5.5~ci~20111215233041
created from:
tree:git://git.linaro.org/kernel/linux-linaro-3.1.git
branch:master
tree:git://kernel.ubuntu.com/ubuntu/ubuntu-precise.git
branch:latest tagged release based on upstream v3.1
tree:git://git.linaro.org/ubuntu/linux-linaro-precise.git
branch:master
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=eddfca20a7fa4584efba3cb5b122e6846e50c7b4
commit eddfca20a7fa4584efba3cb5b122e6846e50c7b4
Author: John Rigby <john.rigby@linaro.org>
Date: Wed Dec 7 21:11:35 2011 -0700
LINARO: mkflavourbranches: improvements for kernel ci
make signing tags optional
replace ~'s in tags with -'s
Signed-off-by: John Rigby <john.rigby@linaro.org>
Signed-off-by: Linaro CI <john.rigby@linaro.org>
| -rw-r--r-- | debian.linaro/changelog | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog index 11fd42a3101..d8d9b51b7b0 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -2,10 +2,16 @@ linux-linaro (3.1.0-5.5~ci~20111215233041) natty; urgency=low * LINARO: CI: Autogenerated Continuous Integration Build * Rebase on new upstreams + * linux-linaro 3.1.0-5.5~ci~20111215233041 created from: + tree:git://git.linaro.org/kernel/linux-linaro-3.1.git + branch:master tree:git://kernel.ubuntu.com/ubuntu/ubuntu- + precise.git branch:latest tagged release based on upstream + v3.1 tree:git://git.linaro.org/ubuntu/linux-linaro- + precise.git branch:master -- Linaro CI <john.rigby@linaro.org> Thu, 15 Dec 2011 23:41:12 +0000 -linux-linaro (3.1.0-4.4) UNRELEASED; urgency=low +linux-linaro (3.1.0-4.4) oneiric; urgency=low [ Dave Martin ] |