diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/arch/i386/kernel/traps.c linux-2.6.17.8-vs2.1.1-rc29/arch/i386/kernel/traps.c
--- linux-2.6.17.8-vs2.1.1-rc28.n/arch/i386/kernel/traps.c	2006-07-09 17:06:47 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/arch/i386/kernel/traps.c	2006-08-17 01:24:55 +0200
@@ -405,7 +405,8 @@ void die(const char * str, struct pt_reg
 			printk(KERN_EMERG "EIP: [<%08lx>] ", regs->eip);
 			print_symbol("%s", regs->eip);
 			printk(" SS:ESP %04x:%08lx\n", ss, esp);
-		} else
+		}
+		else
 			regs = NULL;
   	} else
 		printk(KERN_EMERG "Recursive die() failure, output suppressed\n");
diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/fs/jfs/jfs_dinode.h linux-2.6.17.8-vs2.1.1-rc29/fs/jfs/jfs_dinode.h
--- linux-2.6.17.8-vs2.1.1-rc28.n/fs/jfs/jfs_dinode.h	2006-07-09 17:06:49 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/fs/jfs/jfs_dinode.h	2006-08-17 01:24:55 +0200
@@ -162,8 +162,8 @@ struct dinode {
 #define JFS_APPEND_FL		0x01000000 /* writes to file may only append */
 #define JFS_IMMUTABLE_FL	0x02000000 /* Immutable file */
 
-#define	JFS_BARRIER_FL		0x04000000 /* Barrier for chroot() */
-#define	JFS_IUNLINK_FL		0x08000000 /* Immutable unlink */
+#define JFS_BARRIER_FL		0x04000000 /* Barrier for chroot() */
+#define JFS_IUNLINK_FL		0x08000000 /* Immutable unlink */
 
 #define JFS_FL_USER_VISIBLE	0x0FF80000
 #define JFS_FL_USER_MODIFIABLE	0x03F80000
@@ -173,4 +173,5 @@ struct dinode {
 #define JFS_IOC_GETFLAGS	_IOR('f', 1, long)
 #define JFS_IOC_SETFLAGS	_IOW('f', 2, long)
 
+
 #endif /*_H_JFS_DINODE */
diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/fs/jfs/jfs_xtree.c linux-2.6.17.8-vs2.1.1-rc29/fs/jfs/jfs_xtree.c
--- linux-2.6.17.8-vs2.1.1-rc28.n/fs/jfs/jfs_xtree.c	2006-07-09 17:06:49 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/fs/jfs/jfs_xtree.c	2006-08-17 01:24:55 +0200
@@ -1251,7 +1251,7 @@ xtSplitPage(tid_t tid, struct inode *ip,
 	rbn = addressPXD(pxd);
 
 	/* Allocate blocks to quota. */
-	if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
+       if (DQUOT_ALLOC_BLOCK(ip, lengthPXD(pxd))) {
 	       rc = -EDQUOT;
 	       goto clean_up;
 	}
diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/fs/ocfs2/inode.c linux-2.6.17.8-vs2.1.1-rc29/fs/ocfs2/inode.c
--- linux-2.6.17.8-vs2.1.1-rc28.n/fs/ocfs2/inode.c	2006-07-09 17:06:49 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/fs/ocfs2/inode.c	2006-08-17 01:24:55 +0200
@@ -397,7 +397,6 @@ int ocfs2_populate_inode(struct inode *i
 	ocfs2_set_inode_flags(inode);
 	inode->i_flags |= S_NOATIME;
 	status = 0;
-
 bail:
 	mlog_exit(status);
 	return status;
diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/include/net/sock.h linux-2.6.17.8-vs2.1.1-rc29/include/net/sock.h
--- linux-2.6.17.8-vs2.1.1-rc28.n/include/net/sock.h	2006-07-09 17:07:13 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/include/net/sock.h	2006-08-17 01:24:55 +0200
@@ -116,9 +116,9 @@ struct sock_common {
 	unsigned int		skc_hash;
 	struct proto		*skc_prot;
 	xid_t			skc_xid;
-	struct vx_info	*skc_vx_info;
+	struct vx_info		*skc_vx_info;
 	nid_t			skc_nid;
-	struct nx_info	*skc_nx_info;
+	struct nx_info		*skc_nx_info;
 };
 
 /**
diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/kernel/capability.c linux-2.6.17.8-vs2.1.1-rc29/kernel/capability.c
--- linux-2.6.17.8-vs2.1.1-rc28.n/kernel/capability.c	2006-07-09 17:07:13 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/kernel/capability.c	2006-08-17 01:24:55 +0200
@@ -253,4 +253,3 @@ int capable(int cap)
 	return __capable(current, cap);
 }
 EXPORT_SYMBOL(capable);
-
diff -NurpP linux-2.6.17.8-vs2.1.1-rc28.n/net/ipv4/udp.c linux-2.6.17.8-vs2.1.1-rc29/net/ipv4/udp.c
--- linux-2.6.17.8-vs2.1.1-rc28.n/net/ipv4/udp.c	2006-08-06 06:07:14 +0200
+++ linux-2.6.17.8-vs2.1.1-rc29/net/ipv4/udp.c	2006-08-17 01:24:55 +0200
@@ -216,7 +216,6 @@ static void udp_v4_unhash(struct sock *s
 	write_unlock_bh(&udp_hash_lock);
 }
 
-
 /* UDP is nearly always wildcards out the wazoo, it makes no sense to try
  * harder than this. -DaveM
  */