diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-01-07 09:40:01 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 16:05:19 -0600 |
| commit | c410a6a9500c458a244813907be38e2d62992dac (patch) | |
| tree | 3e6ea07b84506681a58e8aff2b6a6a949aecdd7e /debian.linaro | |
| parent | f57edd26d6d44a935bd45171b194341d3d3b9664 (diff) | |
LINARO: rebase to upstream linaro-linux-2.6.37 and Ubuntu
linaro-linux-2.6.37-upstream-24Jan2011
Ubuntu-2.6.37-12.28
Three Ubuntu patches were skipped because of conflicting upstream patches:
ARM: stack protector: change the canary value per task
Revert "ARM: stack protector: change the canary value per task"
UBUNTU: SAUCE: ARM: OMAP: Beagle: support twl gpio differences on xM
Signed-off-by: John Rigby <john.rigby@linaro.org>
Diffstat (limited to 'debian.linaro')
| -rw-r--r-- | debian.linaro/changelog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog index c8935fadaa4..d59f40b2595 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -4,6 +4,16 @@ linux-linaro (2.6.37-1003.6) UNRELEASED; urgency=low CHANGELOG: Use the printchanges target to see the curent changes. CHANGELOG: Use the insertchanges target to create the final log. + [ John Rigby ] + + * rebase to new upstreams: + linaro-linux-2.6.37-upstream-24Jan2011 + Ubuntu-2.6.37-12.28 + Skipping because of conflicting upstream patches: + ARM: stack protector: change the canary value per task + Revert "ARM: stack protector: change the canary value per task" + UBUNTU: SAUCE: ARM: OMAP: Beagle: support twl gpio differences on xM + -- John Rigby <john.rigby@linaro.org> Mon, 24 Jan 2011 17:38:49 -0700 linux-linaro (2.6.37-1002.5) natty; urgency=low |