Merge last change to 3.11.5-1 from the sid branch

svn path=/dists/trunk/linux/; revision=20713

debian/changelog

@@ -38,6 +38,7 @@ linux (3.11.5-1) unstable; urgency=low
     (CVE-2013-4345)
   * mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
   * Set ABI to 1
+  * [i386] Remove xen-linux-system-<version> packages (Closes: #726010)
 
   [ Ian Campbell ]
   * [armhf] Enable CONFIG_PCI for multiplatform flavour.
@@ -47,7 +48,7 @@ linux (3.11.5-1) unstable; urgency=low
     by the multiplatform flavour.
   * [armel/kirkwood] Add orion-ehci, mvmdio and of_mdio modules to udebs.
 
- -- Ben Hutchings <ben@decadent.org.uk>  Thu, 17 Oct 2013 00:32:15 +0100
+ -- Ben Hutchings <ben@decadent.org.uk>  Thu, 17 Oct 2013 14:46:41 +0100
 
 linux (3.11-1~exp1) experimental; urgency=low
 

debian/config/i386/none/defines

@@ -7,14 +7,5 @@ flavours:
 [686-pae_description]
 parts: xen
 
-[686-pae_xen]
-flavours:
- i386
- amd64
-
 [amd64_description]
 parts: xen
-
-[amd64_xen]
-flavours:
- amd64