aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2014-04-20 20:55:55 +0000
committerBen Hutchings <benh@debian.org>2014-04-20 20:55:55 +0000
commitb183dcc8d0452ab8bceac4268e0788cb3956697f (patch)
treea0146296ca95d6808e7ca3b398e29f633657014b
parentbbd09ff62bf04974b99619d33704ed58c448491d (diff)
downloadkernel_replicant_linux-b183dcc8d0452ab8bceac4268e0788cb3956697f.tar.gz
kernel_replicant_linux-b183dcc8d0452ab8bceac4268e0788cb3956697f.tar.bz2
kernel_replicant_linux-b183dcc8d0452ab8bceac4268e0788cb3956697f.zip
Merge last change to 3.14.1-1~exp1 and bump version for the subsequent change
svn path=/dists/trunk/linux/; revision=21250
-rw-r--r--debian/changelog14
1 files changed, 9 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 5450f8dccdda..1e6f4086ec08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-linux (3.14.1-1~exp1) UNRELEASED; urgency=medium
+linux (3.14.1-1~exp2) UNRELEASED; urgency=medium
+
+ [ Ian Campbell ]
+ * [armhf] Drop suffix from kernel udeb.
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sun, 20 Apr 2014 21:54:54 +0100
+
+linux (3.14.1-1~exp1) experimental; urgency=medium
* New upstream stable update:
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.14.1
@@ -8,10 +15,7 @@ linux (3.14.1-1~exp1) UNRELEASED; urgency=medium
* [armhf] Enable SECURITY_APPARMOR, SECURITY_TOMOYO
* [rt] Update to 3.14.0-rt1 and reenable
- [ Ian Campbell ]
- * [armhf] Drop suffix from kernel udeb.
-
- -- Ben Hutchings <ben@decadent.org.uk> Mon, 14 Apr 2014 01:58:22 +0100
+ -- Ben Hutchings <ben@decadent.org.uk> Thu, 17 Apr 2014 13:17:18 +0100
linux (3.14-1~exp1) experimental; urgency=medium