aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-10-17 11:15:48 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 15:22:49 -0700
commit09bc5925c3602e7c17fbe4427dc882cc3a54746d (patch)
tree321fdbadeee024fc6cc6150457036db8d3203ced
parent1c3e201d7f72a94f6303dd7836925c0faa944fbb (diff)
LINARO: Rebase on new upstreams
commit 30ad23712ecc22a4d026a4b6af21ac65c303325e Author: Arnd Bergmann <arnd@arndb.de> Date: Sat Oct 8 17:07:50 2011 +0200 ARM: kprobes: work around build errors and commit 9e08413f4f7115fe1c4233d544ab8379c51cd4c6 Author: Andiry Xu <andiry.xu@amd.com> Date: Fri Sep 23 14:19:54 2011 -0700 UBUNTU: SAUCE: (drop during 3.2 merge) xHCI: AMD isoc link TRB chain bit quirk Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/changelog16
1 files changed, 14 insertions, 2 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index fa6a47ff9e5..9ae6a48dc9f 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -8,8 +8,20 @@ linux-linaro (3.1.0-1.1) UNRELEASED; urgency=low
* Start 3.1 based precise release
linux-linaro 3.0.0-1007.11 rebased on
- snapshot of Ubuntu precise as of 12Oct2011 rebased on
- snapshot of linux-linaro-3.1 as of 12Oct2011
+ snapshot of Ubuntu precise as of 17Oct2011:
+ commit 9e08413f4f7115fe1c4233d544ab8379c51cd4c6
+ Author: Andiry Xu <andiry.xu@amd.com>
+ Date: Fri Sep 23 14:19:54 2011 -0700
+
+ UBUNTU: SAUCE: (drop during 3.2 merge) xHCI: AMD isoc link TRB chain bit quirk
+
+ rebased on
+ snapshot of linux-linaro-3.1 as of 17Oct2011
+ commit 30ad23712ecc22a4d026a4b6af21ac65c303325e
+ Author: Arnd Bergmann <arnd@arndb.de>
+ Date: Sat Oct 8 17:07:50 2011 +0200
+
+ ARM: kprobes: work around build errors
-- John Rigby <john.rigby@linaro.org> Wed, 12 Oct 2011 17:37:14 -0600