Import patches-unapplied version 2.54 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: fcc9b0a0b6

New changelog entries:
  * Remove the x-loader packages from omap and omap4 flavours, as they
    are now using the MLO provided by their respective u-boot packages.
  * Add zram-config to the ac100 subarch to replace the installer hack.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.54) precise; urgency=low
+
+  * Remove the x-loader packages from omap and omap4 flavours, as they
+    are now using the MLO provided by their respective u-boot packages.
+  * Add zram-config to the ac100 subarch to replace the installer hack.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 25 Jan 2012 22:34:59 -0700
+
 livecd-rootfs (2.53) precise; urgency=low
 
   * live-build/auto/config: Fix ubuntustudio-dvd task selection.

live-build/auto/config

@@ -215,11 +215,11 @@ case $ARCH in
 				BINARY_REMOVE_LINUX=false
 				;;
 			omap)
-				add_package install x-loader-omap3-beagle u-boot-linaro-omap3-beagle
+				add_package install u-boot-linaro-omap3-beagle
 				BINARY_REMOVE_LINUX=false
 				;;
 			omap4)
-				add_package install x-loader-omap4-panda u-boot-linaro-omap4-panda ti-omap4-ppa
+				add_package install u-boot-linaro-omap4-panda ti-omap4-ppa
 				BINARY_REMOVE_LINUX=false
 				;;
 			mx5)
@@ -230,7 +230,7 @@ case $ARCH in
 				;;
 			ac100)
 				COMPONENTS='main restricted universe'
-				add_package install ac100-tarball-installer
+				add_package install ac100-tarball-installer zram-config
 				BINARY_REMOVE_LINUX=false
 				PREINSTALL_POOL_SEEDS=""
 				;;