diff --git a/[refs] b/[refs]
index d7071fed85e3..b3fb16bb297b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 526719ba51e7d7bd31f7af9ab04b015b70096685
+refs/heads/master: e214a8cc7a81f20ed7cb4f6373cf15048556bbac
diff --git a/trunk/drivers/char/hw_random/amd-rng.c b/trunk/drivers/char/hw_random/amd-rng.c
index cd0ba51f7c80..c422e870dc52 100644
--- a/trunk/drivers/char/hw_random/amd-rng.c
+++ b/trunk/drivers/char/hw_random/amd-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc
+ * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
  *
  * derived from
  *
diff --git a/trunk/drivers/char/hw_random/geode-rng.c b/trunk/drivers/char/hw_random/geode-rng.c
index 64d513f68368..fed4ef5569f5 100644
--- a/trunk/drivers/char/hw_random/geode-rng.c
+++ b/trunk/drivers/char/hw_random/geode-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc
+ * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
  *
  * derived from
  *
diff --git a/trunk/drivers/char/hw_random/intel-rng.c b/trunk/drivers/char/hw_random/intel-rng.c
index 5dcbe603eca2..8a2fce0756ec 100644
--- a/trunk/drivers/char/hw_random/intel-rng.c
+++ b/trunk/drivers/char/hw_random/intel-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc
+ * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
  *
  * derived from
  *
diff --git a/trunk/drivers/char/hw_random/via-rng.c b/trunk/drivers/char/hw_random/via-rng.c
index 4e9573c1d39e..128202e18fc9 100644
--- a/trunk/drivers/char/hw_random/via-rng.c
+++ b/trunk/drivers/char/hw_random/via-rng.c
@@ -11,7 +11,7 @@
  * derived from
  *
  * Hardware driver for the AMD 768 Random Number Generator (RNG)
- * (c) Copyright 2001 Red Hat Inc
+ * (c) Copyright 2001 Red Hat Inc <alan@redhat.com>
  *
  * derived from
  *
diff --git a/trunk/drivers/leds/leds-da903x.c b/trunk/drivers/leds/leds-da903x.c
index 2768c69257f6..f1fddb18d70d 100644
--- a/trunk/drivers/leds/leds-da903x.c
+++ b/trunk/drivers/leds/leds-da903x.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/leds.h>
-#include <linux/workqueue.h>
 #include <linux/mfd/da903x.h>
 
 #define DA9030_LED1_CONTROL	0x20
diff --git a/trunk/fs/coda/psdev.c b/trunk/fs/coda/psdev.c
index 0376ac66c44a..cfd29da714d1 100644
--- a/trunk/fs/coda/psdev.c
+++ b/trunk/fs/coda/psdev.c
@@ -2,7 +2,7 @@
  *      	An implementation of a loadable kernel mode driver providing
  *		multiple kernel/user space bidirectional communications links.
  *
- * 		Author: 	Alan Cox <alan@lxorguk.ukuu.org.uk>
+ * 		Author: 	Alan Cox <alan@redhat.com>
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index dc52793ff8f8..b9195c02a863 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -5,7 +5,7 @@
  *
  *  nfs inode and superblock handling functions
  *
- *  Modularised by Alan Cox <alan@lxorguk.ukuu.org.uk>, while hacking some
+ *  Modularised by Alan Cox <Alan.Cox@linux.org>, while hacking some
  *  experimental NFS changes. Modularisation taken straight from SYS5 fs.
  *
  *  Change to nfs_read_super() to permit NFS mounts to multi-homed hosts.
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index f48db679a1c6..a3b0061dfd45 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -5,7 +5,7 @@
  *
  *  nfs superblock handling functions
  *
- *  Modularised by Alan Cox <alan@lxorguk.ukuu.org.uk>, while hacking some
+ *  Modularised by Alan Cox <Alan.Cox@linux.org>, while hacking some
  *  experimental NFS changes. Modularisation taken straight from SYS5 fs.
  *
  *  Change to nfs_read_super() to permit NFS mounts to multi-homed hosts.
diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c
index 6af7fba7abb1..bb9f4b05703d 100644
--- a/trunk/fs/proc/array.c
+++ b/trunk/fs/proc/array.c
@@ -40,7 +40,7 @@
  *
  *
  * Alan Cox	     :  security fixes.
- *			<alan@lxorguk.ukuu.org.uk>
+ *			<Alan.Cox@linux.org>
  *
  * Al Viro           :  safe handling of mm_struct
  *
diff --git a/trunk/include/net/phonet/phonet.h b/trunk/include/net/phonet/phonet.h
index d4e72508e145..c6a245184460 100644
--- a/trunk/include/net/phonet/phonet.h
+++ b/trunk/include/net/phonet/phonet.h
@@ -27,7 +27,7 @@
  * The lower layers may not require more space, ever. Make sure it's
  * enough.
  */
-#define MAX_PHONET_HEADER	8
+#define MAX_PHONET_HEADER	(8 + MAX_HEADER)
 
 /*
  * Every Phonet* socket has this structure first in its