diff -Nru qemu-linaro-1.0.50-2012.03/debian/changelog qemu-linaro-1.0.50-2012.03/debian/changelog
--- qemu-linaro-1.0.50-2012.03/debian/changelog	2012-04-22 13:54:07.000000000 +0000
+++ qemu-linaro-1.0.50-2012.03/debian/changelog	2012-09-28 15:47:19.000000000 +0000
@@ -1,3 +1,11 @@
+qemu-linaro (1.0.50-2012.03-0ubuntu2.1) precise-proposed; urgency=low
+
+  * debian/patches/use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch:
+    Allow loading kernels on systems w/ > 2G emulated memory. LP: #1030588.
+  * Enable flat device tree support. LP: #1030594.
+
+ -- dann frazier <dann.frazier@canonical.com>  Sun, 29 Jul 2012 12:40:25 -0600
+
 qemu-linaro (1.0.50-2012.03-0ubuntu2) precise; urgency=low
 
   * Add missing #include that caused a build failure on powerpc.
diff -Nru qemu-linaro-1.0.50-2012.03/debian/control qemu-linaro-1.0.50-2012.03/debian/control
--- qemu-linaro-1.0.50-2012.03/debian/control	2012-04-22 13:26:12.000000000 +0000
+++ qemu-linaro-1.0.50-2012.03/debian/control	2012-09-28 15:37:24.000000000 +0000
@@ -14,6 +14,7 @@
                libncurses5-dev,
                libbrlapi-dev,
                libcurl4-gnutls-dev,
+               libfdt-dev,
                libgnutls-dev,
                libsasl2-dev,
                libspice-protocol-dev [amd64],
diff -Nru qemu-linaro-1.0.50-2012.03/debian/patches/debian-changes qemu-linaro-1.0.50-2012.03/debian/patches/debian-changes
--- qemu-linaro-1.0.50-2012.03/debian/patches/debian-changes	1970-01-01 00:00:00.000000000 +0000
+++ qemu-linaro-1.0.50-2012.03/debian/patches/debian-changes	2012-09-28 15:47:35.000000000 +0000
@@ -0,0 +1,40 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ qemu-linaro (1.0.50-2012.03-0ubuntu2.1) precise-proposed; urgency=low
+ .
+   * debian/patches/use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch:
+     Allow loading kernels on systems w/ > 2G emulated memory. LP: #1030588.
+   * Enable flat device tree support. LP: #1030594.
+Author: dann frazier <dann.frazier@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1030588
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1030594
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- qemu-linaro-1.0.50-2012.03.orig/cache-utils.h
++++ qemu-linaro-1.0.50-2012.03/cache-utils.h
+@@ -2,8 +2,6 @@
+ #define QEMU_CACHE_UTILS_H
+ 
+ #if defined(_ARCH_PPC)
+-#include <stdint.h>
+-
+ struct qemu_cache_conf {
+     unsigned long dcache_bsize;
+     unsigned long icache_bsize;
diff -Nru qemu-linaro-1.0.50-2012.03/debian/patches/series qemu-linaro-1.0.50-2012.03/debian/patches/series
--- qemu-linaro-1.0.50-2012.03/debian/patches/series	2012-04-22 13:37:05.000000000 +0000
+++ qemu-linaro-1.0.50-2012.03/debian/patches/series	2012-09-28 15:47:35.000000000 +0000
@@ -1,2 +1,4 @@
 define_AT_EMPTY_PATH.patch
 powerpc-missing-include.patch
+use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch
+debian-changes
diff -Nru qemu-linaro-1.0.50-2012.03/debian/patches/use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch qemu-linaro-1.0.50-2012.03/debian/patches/use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch
--- qemu-linaro-1.0.50-2012.03/debian/patches/use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch	1970-01-01 00:00:00.000000000 +0000
+++ qemu-linaro-1.0.50-2012.03/debian/patches/use-an-uint64_t-for-the-max_sz-parameter-in-load_image_targphys.patch	2012-09-28 15:37:24.000000000 +0000
@@ -0,0 +1,34 @@
+Description: use an uint64_t for the max_sz parameter in load_image_targphys
+ Allow load_image_targphys to load files on systems with more than 2G of
+ emulated memory by changing the max_sz parameter from an int to an
+ uint64_t.
+Author: Mark Langsdorf <mark.langsdorf@calxeda.com>
+
+---
+
+Origin: upstream, http://git.linaro.org/gitweb?p=qemu/qemu-linaro.git;a=commitdiff;h=80a2ba3d3cf33b777d6a45776b0625b9a4283951
+Last-Update: 2012-07-27
+
+--- qemu-linaro-1.0.50-2012.03.orig/hw/loader.h
++++ qemu-linaro-1.0.50-2012.03/hw/loader.h
+@@ -4,7 +4,8 @@
+ /* loader.c */
+ int get_image_size(const char *filename);
+ int load_image(const char *filename, uint8_t *addr); /* deprecated */
+-int load_image_targphys(const char *filename, target_phys_addr_t, int max_sz);
++int load_image_targphys(const char *filename, target_phys_addr_t,
++                        uint64_t max_sz);
+ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
+              void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
+              uint64_t *highaddr, int big_endian, int elf_machine,
+--- qemu-linaro-1.0.50-2012.03.orig/hw/loader.c
++++ qemu-linaro-1.0.50-2012.03/hw/loader.c
+@@ -103,7 +103,7 @@ ssize_t read_targphys(const char *name,
+ 
+ /* return the size or -1 if error */
+ int load_image_targphys(const char *filename,
+-			target_phys_addr_t addr, int max_sz)
++                        target_phys_addr_t addr, uint64_t max_sz)
+ {
+     int size;
+