diff -u git.old/patches/dynenv-harden.patch git/patches/dynenv-harden.patch
--- git.old/patches/dynenv-harden.patch	2007-09-17 16:38:00.000000000 -0700
+++ git/patches/dynenv-harden.patch	2008-05-03 16:34:40.000000000 -0700
@@ -19,7 +19,7 @@
  
 -static int
 +int
- arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
+ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size)
  {
  	int idx = nand_curr_device;
 Index: u-boot/include/util.h
diff -u git.old/patches/nand-dynamic_partitions.patch git/patches/nand-dynamic_partitions.patch
--- git.old/patches/nand-dynamic_partitions.patch	2008-02-14 03:00:56.000000000 -0800
+++ git/patches/nand-dynamic_partitions.patch	2008-05-03 16:36:35.000000000 -0700
@@ -234,8 +234,8 @@
  }
  
  int
--arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
-+arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size, int net)
+-arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size)
++arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size, int net)
  {
  	int idx = nand_curr_device;
  #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
Common subdirectories: git.old/patches/.svn and git/patches/.svn
diff -u git.old/patches/uboot-dfu.patch git/patches/uboot-dfu.patch
--- git.old/patches/uboot-dfu.patch	2008-02-14 03:00:56.000000000 -0800
+++ git/patches/uboot-dfu.patch	2008-05-03 16:39:13.000000000 -0700
@@ -1593,7 +1593,7 @@
 -BIN_FILES	= img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX)
 +BIN_FILES	= img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX) mkudfu$(SFX)
  
- OBJ_LINKS	= environment.o crc32.o sha1.o
+ OBJ_LINKS	= environment.o crc32.o md5.o sha1.o image.o
 -OBJ_FILES	= img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o
 +OBJ_FILES	= img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o mkudfu.o
  
diff -u git.old/patches/uboot-gta02.patch git/patches/uboot-gta02.patch
--- git.old/patches/uboot-gta02.patch	2008-04-02 17:07:54.000000000 -0700
+++ git/patches/uboot-gta02.patch	2008-05-03 16:42:26.000000000 -0700
@@ -2153,19 +2153,6 @@
  					nand_info[i].erasesize >> 10);
  		}
  		return 0;
-Index: u-boot/drivers/mtd/nand/nand_ids.c
-===================================================================
---- u-boot.orig/drivers/mtd/nand/nand_ids.c
-+++ u-boot/drivers/mtd/nand/nand_ids.c
-@@ -67,7 +67,7 @@
- 
- 	{"NAND 256MiB 3,3V 8-bit", 	0x71, 512, 256, 0x4000, 0},
- 
--	{"NAND 512MiB 3,3V 8-bit", 	0xDC, 512, 512, 0x4000, 0},
-+	//{"NAND 512MiB 3,3V 8-bit", 	0xDC, 512, 512, 0x4000, 0},
- 
- 	/* These are the new chips with large page size. The pagesize
- 	* and the erasesize is determined from the extended id bytes
 Index: u-boot/board/neo1973/common/udc.c
 ===================================================================
 --- u-boot.orig/board/neo1973/common/udc.c
diff -u git.old/patches/uboot-mokoversion.patch git/patches/uboot-mokoversion.patch
--- git.old/patches/uboot-mokoversion.patch	2008-01-23 02:32:07.000000000 -0800
+++ git/patches/uboot-mokoversion.patch	2008-05-03 16:25:16.000000000 -0700
@@ -1,10 +1,10 @@
-Index: u-boot/tools/setlocalversion
-===================================================================
---- u-boot.orig/tools/setlocalversion
-+++ u-boot/tools/setlocalversion
-@@ -20,3 +20,5 @@
- 		printf '%s' -dirty
- 	fi
+--- git/tools/setlocalversion	2008-05-03 16:22:20.000000000 -0700
++++ git.new/tools/setlocalversion	2008-05-03 16:24:52.000000000 -0700
+@@ -35,5 +35,7 @@
+ 	printf -- '-svn%s' $rev
  fi
-+
+ 
 +printf '%s' -moko12
++
+ # Check for any localversion-* files
+ printf '%s' "`cat localversion-* 2>/dev/null`"
diff -u git.old/patches/uboot-s3c24xx-nand-boot.patch git/patches/uboot-s3c24xx-nand-boot.patch
--- git.old/patches/uboot-s3c24xx-nand-boot.patch	2008-01-23 02:32:07.000000000 -0800
+++ git/patches/uboot-s3c24xx-nand-boot.patch	2008-05-03 16:32:55.000000000 -0700
@@ -142,7 +142,7 @@
  	bl	cpu_init_crit
  #endif
  
--#ifdef	CONFIG_AT91RM9200
+-#ifndef	CONFIG_AT91RM9200
 +#if defined(CONFIG_AT91RM9200) || defined(CONFIG_S3C2410)
  
  #ifndef CONFIG_SKIP_RELOCATE_UBOOT