Import patches-unapplied version 2.314 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: eab885e336

New changelog entries:
  [ Iain Lane ]
  * Small whitespace cleanup in live-build/auto/config
  [ Sebastien Bacher ]
  * Set kernel flavours variable to try to fix amd64 build

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.314) wily; urgency=medium
+
+  [ Iain Lane ]
+  * Small whitespace cleanup in live-build/auto/config
+
+  [ Sebastien Bacher ]
+  * Set kernel flavours variable to try to fix amd64 build
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 10 Jun 2015 15:10:03 +0200
+
 livecd-rootfs (2.313) wily; urgency=medium
 
   * Revert symlink changes, that creates build issues, copy updated hook

live-build/auto/config

@@ -207,6 +207,7 @@ case $PROJECT in
 		add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs
 		COMPONENTS='main restricted universe'
 		LIVE_TASK='ubuntu-touch-live'
+		KERNEL_FLAVOURS=generic
 		case $ARCH in
 			amd64)	add_package live linux-signed-generic ;;
 		esac