--- olpc-2.6-master.00/arch/um/kernel/syscall.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/um/kernel/syscall.c	2007-03-01 11:52:20.000000000 -0500
@@ -15,6 +15,7 @@
 #include "linux/unistd.h"
 #include "linux/slab.h"
 #include "linux/utime.h"
+
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "kern_util.h"
--- olpc-2.6-master.00/kernel/nsproxy.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/nsproxy.c	2007-03-01 11:52:20.000000000 -0500
@@ -70,7 +67,6 @@ struct nsproxy *dup_namespaces(struct ns
 		if (ns->pid_ns)
 			get_pid_ns(ns->pid_ns);
 	}
-
 	return ns;
 }
 
--- olpc-2.6-master.00/fs/ioctl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ioctl.c	2007-03-01 17:09:59.000000000 -0500
@@ -16,6 +19,7 @@ *****
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 
+
 static long do_ioctl(struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {
--- olpc-2.6-master.00/arch/cris/kernel/irq.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/cris/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -92,6 +92,7 @@ skip:
 asmlinkage void do_IRQ(int irq, struct pt_regs * regs)
 {
 	unsigned long sp;
+
 	irq_enter();
 	sp = rdsp();
 	if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) {
--- olpc-2.6-master.00/arch/i386/kernel/irq.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/i386/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -98,7 +98,6 @@ fastcall unsigned int do_IRQ(struct pt_r
 		}
 	}
 #endif
-
 #ifdef CONFIG_4KSTACKS
 
 	curctx = (union irq_ctx *) current_thread_info();
--- olpc-2.6-master.00/arch/i386/kernel/irq.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/i386/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -138,7 +137,6 @@ fastcall unsigned int do_IRQ(struct pt_r
 	} else
 #endif
 		desc->handle_irq(irq, desc);
-
 	irq_exit();
 	set_irq_regs(old_regs);
 	return 1;
--- olpc-2.6-master.00/arch/m32r/kernel/irq.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/m32r/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -78,6 +78,7 @@ skip:
 asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
 {
 	struct pt_regs *old_regs;
+
 	old_regs = set_irq_regs(regs);
 	irq_enter();
 
--- olpc-2.6-master.00/arch/um/kernel/irq.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/um/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -356,6 +356,7 @@ void forward_interrupts(int pid)
 unsigned int do_IRQ(int irq, union uml_pt_regs *regs)
 {
 	struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs);
+
 	irq_enter();
 	__do_IRQ(irq);
 	irq_exit();
--- olpc-2.6-master.00/fs/ext4/ioctl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/ioctl.c	2007-03-01 17:09:59.000000000 -0500
@@ -247,7 +256,6 @@ flags_err:
 
 		return err;
 	}
-
 	default:
 		return -ENOTTY;
 	}
--- olpc-2.6-master.00/fs/ext3/ioctl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/ioctl.c	2007-03-01 17:09:59.000000000 -0500
@@ -247,8 +256,6 @@ flags_err:
 
 		return err;
 	}
-
-
 	default:
 		return -ENOTTY;
 	}
--- olpc-2.6-master.00/include/linux/ext2_fs.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/linux/ext2_fs.h	2007-03-01 11:52:20.000000000 -0500
@@ -317,8 +320,8 @@ struct ext2_inode {
 #define EXT2_MOUNT_XATTR_USER		0x004000  /* Extended user attributes */
 #define EXT2_MOUNT_POSIX_ACL		0x008000  /* POSIX Access Control Lists */
 #define EXT2_MOUNT_XIP			0x010000  /* Execute in place */
-#define EXT2_MOUNT_USRQUOTA		0x020000 /* user quota */
-#define EXT2_MOUNT_GRPQUOTA		0x040000 /* group quota */
+#define EXT2_MOUNT_USRQUOTA		0x020000  /* user quota */
+#define EXT2_MOUNT_GRPQUOTA		0x040000  /* group quota */
 
 
 #define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt