Grsec/PaX: 2.2.2-2.6.32.46-201108301903 + 2.2.2-3.0.4-20110830190320110830

6 files changed, 14544 insertions, 11501 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 61d9a15..81874c9 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -11,7 +11,7 @@ Patch:	1044_linux-2.6.32.45.patch
 From:	http://www.kernel.org
 Desc:	Linux 2.6.39.45
 
-Patch:	4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch
+Patch:	4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.32/1043_linux-2.6.32.44.patch b/2.6.32/1043_linux-2.6.32.44.patch
deleted file mode 100644
index c71b835..0000000
--- a/2.6.32/1043_linux-2.6.32.44.patch
+++ /dev/null
@@ -1,1455 +0,0 @@
-diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
-index 62619f2..a94e49c 100644
---- a/arch/alpha/kernel/osf_sys.c
-+++ b/arch/alpha/kernel/osf_sys.c
-@@ -431,7 +431,7 @@ SYSCALL_DEFINE2(osf_getdomainname, char __user *, name, int, namelen)
- 		return -EFAULT;
- 
- 	len = namelen;
--	if (namelen > 32)
-+	if (len > 32)
- 		len = 32;
- 
- 	down_read(&uts_sem);
-@@ -618,7 +618,7 @@ SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count)
- 	down_read(&uts_sem);
- 	res = sysinfo_table[offset];
- 	len = strlen(res)+1;
--	if (len > count)
-+	if ((unsigned long)len > (unsigned long)count)
- 		len = count;
- 	if (copy_to_user(buf, res, len))
- 		err = -EFAULT;
-@@ -673,7 +673,7 @@ SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer,
- 		return 1;
- 
- 	case GSI_GET_HWRPB:
--		if (nbytes < sizeof(*hwrpb))
-+		if (nbytes > sizeof(*hwrpb))
- 			return -EINVAL;
- 		if (copy_to_user(buffer, hwrpb, nbytes) != 0)
- 			return -EFAULT;
-@@ -1035,6 +1035,7 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,
- {
- 	struct rusage r;
- 	long ret, err;
-+	unsigned int status = 0;
- 	mm_segment_t old_fs;
- 
- 	if (!ur)
-@@ -1043,13 +1044,15 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options,
- 	old_fs = get_fs();
- 		
- 	set_fs (KERNEL_DS);
--	ret = sys_wait4(pid, ustatus, options, (struct rusage __user *) &r);
-+	ret = sys_wait4(pid, (unsigned int __user *) &status, options,
-+			(struct rusage __user *) &r);
- 	set_fs (old_fs);
- 
- 	if (!access_ok(VERIFY_WRITE, ur, sizeof(*ur)))
- 		return -EFAULT;
- 
- 	err = 0;
-+	err |= put_user(status, ustatus);
- 	err |= __put_user(r.ru_utime.tv_sec, &ur->ru_utime.tv_sec);
- 	err |= __put_user(r.ru_utime.tv_usec, &ur->ru_utime.tv_usec);
- 	err |= __put_user(r.ru_stime.tv_sec, &ur->ru_stime.tv_sec);
-diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
-index 52dd804..8904495 100644
---- a/arch/arm/mach-davinci/board-dm365-evm.c
-+++ b/arch/arm/mach-davinci/board-dm365-evm.c
-@@ -413,7 +413,7 @@ fail:
- 	 */
- 	if (have_imager()) {
- 		label = "HD imager";
--		mux |= 1;
-+		mux |= 2;
- 
- 		/* externally mux MMC1/ENET/AIC33 to imager */
- 		mux |= BIT(6) | BIT(5) | BIT(3);
-@@ -434,7 +434,7 @@ fail:
- 		resets &= ~BIT(1);
- 
- 		if (have_tvp7002()) {
--			mux |= 2;
-+			mux |= 1;
- 			resets &= ~BIT(2);
- 			label = "tvp7002 HD";
- 		} else {
-diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
-index 102916f..b6bfe7e 100644
---- a/arch/arm/mach-pxa/cm-x300.c
-+++ b/arch/arm/mach-pxa/cm-x300.c
-@@ -143,10 +143,10 @@ static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = {
- 	GPIO99_GPIO,			/* Ethernet IRQ */
- 
- 	/* RTC GPIOs */
--	GPIO95_GPIO,			/* RTC CS */
--	GPIO96_GPIO,			/* RTC WR */
--	GPIO97_GPIO,			/* RTC RD */
--	GPIO98_GPIO,			/* RTC IO */
-+	GPIO95_GPIO | MFP_LPM_DRIVE_HIGH,	/* RTC CS */
-+	GPIO96_GPIO | MFP_LPM_DRIVE_HIGH,	/* RTC WR */
-+	GPIO97_GPIO | MFP_LPM_DRIVE_HIGH,	/* RTC RD */
-+	GPIO98_GPIO,				/* RTC IO */
- 
- 	/* Standard I2C */
- 	GPIO21_I2C_SCL,
-diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
-index 5009198..d374974 100644
---- a/arch/powerpc/kernel/crash.c
-+++ b/arch/powerpc/kernel/crash.c
-@@ -176,12 +176,8 @@ static void crash_kexec_wait_realmode(int cpu)
- 
- 		while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
- 			barrier();
--			if (!cpu_possible(i)) {
-+			if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0))
- 				break;
--			}
--			if (!cpu_online(i)) {
--				break;
--			}
- 			msecs--;
- 			mdelay(1);
- 		}
-diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
-index 3f6a89b..041e87c 100644
---- a/arch/powerpc/platforms/pseries/hvconsole.c
-+++ b/arch/powerpc/platforms/pseries/hvconsole.c
-@@ -73,7 +73,7 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
- 	if (ret == H_SUCCESS)
- 		return count;
- 	if (ret == H_BUSY)
--		return 0;
-+		return -EAGAIN;
- 	return -EIO;
- }
- 
-diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
-index 69cab24..987ef29 100644
---- a/arch/x86/kernel/hpet.c
-+++ b/arch/x86/kernel/hpet.c
-@@ -27,6 +27,9 @@
- #define HPET_DEV_FSB_CAP		0x1000
- #define HPET_DEV_PERI_CAP		0x2000
- 
-+#define HPET_MIN_CYCLES			128
-+#define HPET_MIN_PROG_DELTA		(HPET_MIN_CYCLES + (HPET_MIN_CYCLES >> 1))
-+
- #define EVT_TO_HPET_DEV(evt) container_of(evt, struct hpet_dev, evt)
- 
- /*
-@@ -298,8 +301,9 @@ static void hpet_legacy_clockevent_register(void)
- 	/* Calculate the min / max delta */
- 	hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,
- 							   &hpet_clockevent);
--	/* 5 usec minimum reprogramming delta. */
--	hpet_clockevent.min_delta_ns = 5000;
-+	/* Setup minimum reprogramming delta. */
-+	hpet_clockevent.min_delta_ns = clockevent_delta2ns(HPET_MIN_PROG_DELTA,
-+							   &hpet_clockevent);
- 
- 	/*
- 	 * Start hpet with the boot cpu mask and make it
-@@ -379,36 +383,37 @@ static int hpet_next_event(unsigned long delta,
- 			   struct clock_event_device *evt, int timer)
- {
- 	u32 cnt;
-+	s32 res;
- 
- 	cnt = hpet_readl(HPET_COUNTER);
- 	cnt += (u32) delta;
- 	hpet_writel(cnt, HPET_Tn_CMP(timer));
- 
- 	/*
--	 * We need to read back the CMP register on certain HPET
--	 * implementations (ATI chipsets) which seem to delay the
--	 * transfer of the compare register into the internal compare
--	 * logic. With small deltas this might actually be too late as
--	 * the counter could already be higher than the compare value
--	 * at that point and we would wait for the next hpet interrupt
--	 * forever. We found out that reading the CMP register back
--	 * forces the transfer so we can rely on the comparison with
--	 * the counter register below. If the read back from the
--	 * compare register does not match the value we programmed
--	 * then we might have a real hardware problem. We can not do
--	 * much about it here, but at least alert the user/admin with
--	 * a prominent warning.
--	 * An erratum on some chipsets (ICH9,..), results in comparator read
--	 * immediately following a write returning old value. Workaround
--	 * for this is to read this value second time, when first
--	 * read returns old value.
-+	 * HPETs are a complete disaster. The compare register is
-+	 * based on a equal comparison and neither provides a less
-+	 * than or equal functionality (which would require to take
-+	 * the wraparound into account) nor a simple count down event
-+	 * mode. Further the write to the comparator register is
-+	 * delayed internally up to two HPET clock cycles in certain
-+	 * chipsets (ATI, ICH9,10). Some newer AMD chipsets have even
-+	 * longer delays. We worked around that by reading back the
-+	 * compare register, but that required another workaround for
-+	 * ICH9,10 chips where the first readout after write can
-+	 * return the old stale value. We already had a minimum
-+	 * programming delta of 5us enforced, but a NMI or SMI hitting
-+	 * between the counter readout and the comparator write can
-+	 * move us behind that point easily. Now instead of reading
-+	 * the compare register back several times, we make the ETIME
-+	 * decision based on the following: Return ETIME if the
-+	 * counter value after the write is less than HPET_MIN_CYCLES
-+	 * away from the event or if the counter is already ahead of
-+	 * the event. The minimum programming delta for the generic
-+	 * clockevents code is set to 1.5 * HPET_MIN_CYCLES.
- 	 */
--	if (unlikely((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt)) {
--		WARN_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt,
--		  KERN_WARNING "hpet: compare register read back failed.\n");
--	}
-+	res = (s32)(cnt - (u32)hpet_readl(HPET_COUNTER));
- 
--	return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
-+	return res < HPET_MIN_CYCLES ? -ETIME : 0;
- }
- 
- static void hpet_legacy_set_mode(enum clock_event_mode mode,
-diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 200fcde..cf98100 100644
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -469,6 +469,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {
- 			DMI_MATCH(DMI_PRODUCT_NAME, "iMac9,1"),
- 		},
- 	},
-+	{	/* Handle problems with rebooting on the Latitude E5420. */
-+		.callback = set_pci_reboot,
-+		.ident = "Dell Latitude E5420",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E5420"),
-+		},
-+	},
- 	{ }
- };
- 
-diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S
-index 4123553..36818f8 100644
---- a/arch/x86/kernel/relocate_kernel_32.S
-+++ b/arch/x86/kernel/relocate_kernel_32.S
-@@ -97,6 +97,8 @@ relocate_kernel:
- 	ret
- 
- identity_mapped:
-+	/* set return address to 0 if not preserving context */
-+	pushl	$0
- 	/* store the start address on the stack */
- 	pushl   %edx
- 
-diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
-index 4de8f5b..7a6f3b3 100644
---- a/arch/x86/kernel/relocate_kernel_64.S
-+++ b/arch/x86/kernel/relocate_kernel_64.S
-@@ -100,6 +100,8 @@ relocate_kernel:
- 	ret
- 
- identity_mapped:
-+	/* set return address to 0 if not preserving context */
-+	pushq	$0
- 	/* store the start address on the stack */
- 	pushq   %rdx
- 
-diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
-index 9486882..885ebe7 100644
---- a/arch/xtensa/kernel/ptrace.c
-+++ b/arch/xtensa/kernel/ptrace.c
-@@ -136,6 +136,9 @@ int ptrace_setxregs(struct task_struct *child, void __user *uregs)
- 	elf_xtregs_t *xtregs = uregs;
- 	int ret = 0;
- 
-+	if (!access_ok(VERIFY_READ, uregs, sizeof(elf_xtregs_t)))
-+		return -EFAULT;
-+
- #if XTENSA_HAVE_COPROCESSORS
- 	/* Flush all coprocessors before we overwrite them. */
- 	coprocessor_flush_all(ti);
-diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
-index fa9bed0..e5bdb9b 100644
---- a/drivers/ata/libata-eh.c
-+++ b/drivers/ata/libata-eh.c
-@@ -2707,10 +2707,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
- 	}
- 
- 	/*
--	 * Some controllers can't be frozen very well and may set
--	 * spuruious error conditions during reset.  Clear accumulated
--	 * error information.  As reset is the final recovery action,
--	 * nothing is lost by doing this.
-+	 * Some controllers can't be frozen very well and may set spurious
-+	 * error conditions during reset.  Clear accumulated error
-+	 * information and re-thaw the port if frozen.  As reset is the
-+	 * final recovery action and we cross check link onlineness against
-+	 * device classification later, no hotplug event is lost by this.
- 	 */
- 	spin_lock_irqsave(link->ap->lock, flags);
- 	memset(&link->eh_info, 0, sizeof(link->eh_info));
-@@ -2719,6 +2720,9 @@ int ata_eh_reset(struct ata_link *link, int classify,
- 	ap->pflags &= ~ATA_PFLAG_EH_PENDING;
- 	spin_unlock_irqrestore(link->ap->lock, flags);
- 
-+	if (ap->pflags & ATA_PFLAG_FROZEN)
-+		ata_eh_thaw_port(ap);
-+
- 	/*
- 	 * Make sure onlineness and classification result correspond.
- 	 * Hotplug could have happened during reset and some
-diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
-index 5ae1b1c..04d6bf8 100644
---- a/drivers/block/cciss.h
-+++ b/drivers/block/cciss.h
-@@ -165,7 +165,7 @@ static void SA5_submit_command( ctlr_info_t *h, CommandList_struct *c)
- 	 printk("Sending %x - down to controller\n", c->busaddr );
- #endif /* CCISS_DEBUG */ 
-          writel(c->busaddr, h->vaddr + SA5_REQUEST_PORT_OFFSET);
--	readl(h->vaddr + SA5_REQUEST_PORT_OFFSET);
-+	readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
- 	 h->commands_outstanding++;
- 	 if ( h->commands_outstanding > h->max_outstanding)
- 		h->max_outstanding = h->commands_outstanding;
-diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c
-index 9ac4972..5b6001b 100644
---- a/drivers/hwmon/max1111.c
-+++ b/drivers/hwmon/max1111.c
-@@ -39,6 +39,8 @@ struct max1111_data {
- 	struct spi_transfer	xfer[2];
- 	uint8_t *tx_buf;
- 	uint8_t *rx_buf;
-+	struct mutex		drvdata_lock;
-+	/* protect msg, xfer and buffers from multiple access */
- };
- 
- static int max1111_read(struct device *dev, int channel)
-@@ -47,6 +49,9 @@ static int max1111_read(struct device *dev, int channel)
- 	uint8_t v1, v2;
- 	int err;
- 
-+	/* writing to drvdata struct is not thread safe, wait on mutex */
-+	mutex_lock(&data->drvdata_lock);
-+
- 	data->tx_buf[0] = (channel << MAX1111_CTRL_SEL_SH) |
- 		MAX1111_CTRL_PD0 | MAX1111_CTRL_PD1 |
- 		MAX1111_CTRL_SGL | MAX1111_CTRL_UNI | MAX1111_CTRL_STR;
-@@ -54,12 +59,15 @@ static int max1111_read(struct device *dev, int channel)
- 	err = spi_sync(data->spi, &data->msg);
- 	if (err < 0) {
- 		dev_err(dev, "spi_sync failed with %d\n", err);
-+		mutex_unlock(&data->drvdata_lock);
- 		return err;
- 	}
- 
- 	v1 = data->rx_buf[0];
- 	v2 = data->rx_buf[1];
- 
-+	mutex_unlock(&data->drvdata_lock);
-+
- 	if ((v1 & 0xc0) || (v2 & 0x3f))
- 		return -EINVAL;
- 
-@@ -175,6 +183,8 @@ static int __devinit max1111_probe(struct spi_device *spi)
- 	if (err)
- 		goto err_free_data;
- 
-+	mutex_init(&data->drvdata_lock);
-+
- 	data->spi = spi;
- 	spi_set_drvdata(spi, data);
- 
-@@ -212,6 +222,7 @@ static int __devexit max1111_remove(struct spi_device *spi)
- 
- 	hwmon_device_unregister(data->hwmon_dev);
- 	sysfs_remove_group(&spi->dev.kobj, &max1111_attr_group);
-+	mutex_destroy(&data->drvdata_lock);
- 	kfree(data->rx_buf);
- 	kfree(data->tx_buf);
- 	kfree(data);
-diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
-index fcf717c..b03cd39 100644
---- a/drivers/md/dm-mpath.c
-+++ b/drivers/md/dm-mpath.c
-@@ -778,6 +778,11 @@ static int parse_features(struct arg_set *as, struct multipath *m)
- 	if (!argc)
- 		return 0;
- 
-+	if (argc > as->argc) {
-+		ti->error = "not enough arguments for features";
-+		return -EINVAL;
-+	}
-+
- 	do {
- 		param_name = shift(as);
- 		argc--;
-diff --git a/drivers/md/dm.c b/drivers/md/dm.c
-index d186687..c988ac2 100644
---- a/drivers/md/dm.c
-+++ b/drivers/md/dm.c
-@@ -36,6 +36,8 @@ static const char *_name = DM_NAME;
- static unsigned int major = 0;
- static unsigned int _major = 0;
- 
-+static DEFINE_IDR(_minor_idr);
-+
- static DEFINE_SPINLOCK(_minor_lock);
- /*
-  * For bio-based dm.
-@@ -315,6 +317,12 @@ static void __exit dm_exit(void)
- 
- 	while (i--)
- 		_exits[i]();
-+
-+	/*
-+	 * Should be empty by this point.
-+	 */
-+	idr_remove_all(&_minor_idr);
-+	idr_destroy(&_minor_idr);
- }
- 
- /*
-@@ -1663,8 +1671,6 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
- /*-----------------------------------------------------------------
-  * An IDR is used to keep track of allocated minor numbers.
-  *---------------------------------------------------------------*/
--static DEFINE_IDR(_minor_idr);
--
- static void free_minor(int minor)
- {
- 	spin_lock(&_minor_lock);
-diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
-index 6a0028e..93653c6 100644
---- a/drivers/media/radio/si4713-i2c.c
-+++ b/drivers/media/radio/si4713-i2c.c
-@@ -1003,7 +1003,7 @@ static int si4713_write_econtrol_string(struct si4713_device *sdev,
- 		char ps_name[MAX_RDS_PS_NAME + 1];
- 
- 		len = control->size - 1;
--		if (len > MAX_RDS_PS_NAME) {
-+		if (len < 0 || len > MAX_RDS_PS_NAME) {
- 			rval = -ERANGE;
- 			goto exit;
- 		}
-@@ -1025,7 +1025,7 @@ static int si4713_write_econtrol_string(struct si4713_device *sdev,
- 		char radio_text[MAX_RDS_RADIO_TEXT + 1];
- 
- 		len = control->size - 1;
--		if (len > MAX_RDS_RADIO_TEXT) {
-+		if (len < 0 || len > MAX_RDS_RADIO_TEXT) {
- 			rval = -ERANGE;
- 			goto exit;
- 		}
-diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
-index d258ed7..f0e9c75 100644
---- a/drivers/media/video/bt8xx/bttv-driver.c
-+++ b/drivers/media/video/bt8xx/bttv-driver.c
-@@ -3532,7 +3532,7 @@ static int radio_s_tuner(struct file *file, void *priv,
- 	if (0 != t->index)
- 		return -EINVAL;
- 
--	bttv_call_all(btv, tuner, g_tuner, t);
-+	bttv_call_all(btv, tuner, s_tuner, t);
- 	return 0;
- }
- 
-diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
-index 13639b3..5891e30 100644
---- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
-+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
-@@ -2979,6 +2979,8 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
- 	if (hdw->input_dirty || hdw->audiomode_dirty || hdw->force_dirty) {
- 		struct v4l2_tuner vt;
- 		memset(&vt, 0, sizeof(vt));
-+		vt.type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?
-+			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
- 		vt.audmode = hdw->audiomode_val;
- 		v4l2_device_call_all(&hdw->v4l2_dev, 0, tuner, s_tuner, &vt);
- 	}
-@@ -5064,6 +5066,8 @@ void pvr2_hdw_status_poll(struct pvr2_hdw *hdw)
- {
- 	struct v4l2_tuner *vtp = &hdw->tuner_signal_info;
- 	memset(vtp, 0, sizeof(*vtp));
-+	vtp->type = (hdw->input_val == PVR2_CVAL_INPUT_RADIO) ?
-+		V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
- 	hdw->tuner_signal_stale = 0;
- 	/* Note: There apparently is no replacement for VIDIOC_CROPCAP
- 	   using v4l2-subdev - therefore we can't support that AT ALL right
-diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
-index 30cc334..265bfb5 100644
---- a/drivers/media/video/v4l2-ioctl.c
-+++ b/drivers/media/video/v4l2-ioctl.c
-@@ -1600,6 +1600,8 @@ static long __video_do_ioctl(struct file *file,
- 		if (!ops->vidioc_g_tuner)
- 			break;
- 
-+		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
-+			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
- 		ret = ops->vidioc_g_tuner(file, fh, p);
- 		if (!ret)
- 			dbgarg(cmd, "index=%d, name=%s, type=%d, "
-@@ -1618,6 +1620,8 @@ static long __video_do_ioctl(struct file *file,
- 
- 		if (!ops->vidioc_s_tuner)
- 			break;
-+		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
-+			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
- 		dbgarg(cmd, "index=%d, name=%s, type=%d, "
- 				"capability=0x%x, rangelow=%d, "
- 				"rangehigh=%d, signal=%d, afc=%d, "
-@@ -1636,6 +1640,8 @@ static long __video_do_ioctl(struct file *file,
- 		if (!ops->vidioc_g_frequency)
- 			break;
- 
-+		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?
-+			V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
- 		ret = ops->vidioc_g_frequency(file, fh, p);
- 		if (!ret)
- 			dbgarg(cmd, "tuner=%d, type=%d, frequency=%d\n",
-diff --git a/drivers/net/jme.c b/drivers/net/jme.c
-index a893f45..0fbca76 100644
---- a/drivers/net/jme.c
-+++ b/drivers/net/jme.c
-@@ -681,20 +681,28 @@ jme_make_new_rx_buf(struct jme_adapter *jme, int i)
- 	struct jme_ring *rxring = &(jme->rxring[0]);
- 	struct jme_buffer_info *rxbi = rxring->bufinf + i;
- 	struct sk_buff *skb;
-+	dma_addr_t mapping;
- 
- 	skb = netdev_alloc_skb(jme->dev,
- 		jme->dev->mtu + RX_EXTRA_LEN);
- 	if (unlikely(!skb))
- 		return -ENOMEM;
- 
-+	mapping = pci_map_page(jme->pdev, virt_to_page(skb->data),
-+			       offset_in_page(skb->data), skb_tailroom(skb),
-+			       PCI_DMA_FROMDEVICE);
-+	if (unlikely(pci_dma_mapping_error(jme->pdev, mapping))) {
-+		dev_kfree_skb(skb);
-+		return -ENOMEM;
-+	}
-+
-+	if (likely(rxbi->mapping))
-+		pci_unmap_page(jme->pdev, rxbi->mapping,
-+			       rxbi->len, PCI_DMA_FROMDEVICE);
-+
- 	rxbi->skb = skb;
- 	rxbi->len = skb_tailroom(skb);
--	rxbi->mapping = pci_map_page(jme->pdev,
--					virt_to_page(skb->data),
--					offset_in_page(skb->data),
--					rxbi->len,
--					PCI_DMA_FROMDEVICE);
--
-+	rxbi->mapping = mapping;
- 	return 0;
- }
- 
-diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index 0d3326d..6f8352c 100644
---- a/drivers/pci/pci.c
-+++ b/drivers/pci/pci.c
-@@ -1507,7 +1507,7 @@ void pci_enable_ari(struct pci_dev *dev)
- {
- 	int pos;
- 	u32 cap;
--	u16 ctrl;
-+	u16 flags, ctrl;
- 	struct pci_dev *bridge;
- 
- 	if (!dev->is_pcie || dev->devfn)
-@@ -1525,6 +1525,11 @@ void pci_enable_ari(struct pci_dev *dev)
- 	if (!pos)
- 		return;
- 
-+	/* ARI is a PCIe v2 feature */
-+	pci_read_config_word(bridge, pos + PCI_EXP_FLAGS, &flags);
-+	if ((flags & PCI_EXP_FLAGS_VERS) < 2)
-+		return;
-+
- 	pci_read_config_dword(bridge, pos + PCI_EXP_DEVCAP2, &cap);
- 	if (!(cap & PCI_EXP_DEVCAP2_ARI))
- 		return;
-diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
-index 33cf988..4f43306 100644
---- a/drivers/scsi/libsas/sas_expander.c
-+++ b/drivers/scsi/libsas/sas_expander.c
-@@ -840,6 +840,9 @@ static struct domain_device *sas_ex_discover_expander(
- 
- 	res = sas_discover_expander(child);
- 	if (res) {
-+		spin_lock_irq(&parent->port->dev_list_lock);
-+		list_del(&child->dev_list_node);
-+		spin_unlock_irq(&parent->port->dev_list_lock);
- 		kfree(child);
- 		return NULL;
- 	}
-diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index 483370f..9ab8c86 100644
---- a/drivers/scsi/pmcraid.c
-+++ b/drivers/scsi/pmcraid.c
-@@ -3557,6 +3557,9 @@ static long pmcraid_ioctl_passthrough(
- 			pmcraid_err("couldn't build passthrough ioadls\n");
- 			goto out_free_buffer;
- 		}
-+	} else if (request_size < 0) {
-+		rc = -EINVAL;
-+		goto out_free_buffer;
- 	}
- 
- 	/* If data is being written into the device, copy the data from user
-diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
-index 802e91c..ae0ae2d 100644
---- a/drivers/scsi/scsi_devinfo.c
-+++ b/drivers/scsi/scsi_devinfo.c
-@@ -196,6 +196,7 @@ static struct {
- 	{"IBM", "ProFibre 4000R", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
- 	{"IBM", "2105", NULL, BLIST_RETRY_HWERROR},
- 	{"iomega", "jaz 1GB", "J.86", BLIST_NOTQ | BLIST_NOLUN},
-+	{"IOMEGA", "ZIP", NULL, BLIST_NOTQ | BLIST_NOLUN},
- 	{"IOMEGA", "Io20S         *F", NULL, BLIST_KEY},
- 	{"INSITE", "Floptical   F*8I", NULL, BLIST_KEY},
- 	{"INSITE", "I325VM", NULL, BLIST_KEY},
-@@ -242,6 +243,7 @@ static struct {
- 	{"Tornado-", "F4", "*", BLIST_NOREPORTLUN},
- 	{"TOSHIBA", "CDROM", NULL, BLIST_ISROM},
- 	{"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
-+	{"Traxdata", "CDR4120", NULL, BLIST_NOLUN},	/* locks up */
- 	{"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36},
- 	{"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN},
- 	{"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN},
-diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
-index 3b082dd..340124d 100644
---- a/drivers/scsi/ses.c
-+++ b/drivers/scsi/ses.c
-@@ -157,6 +157,10 @@ static unsigned char *ses_get_page2_descriptor(struct enclosure_device *edev,
- 	return NULL;
- }
- 
-+/* For device slot and array device slot elements, byte 3 bit 6
-+ * is "fault sensed" while byte 3 bit 5 is "fault reqstd". As this
-+ * code stands these bits are shifted 4 positions right so in
-+ * sysfs they will appear as bits 2 and 1 respectively. Strange. */
- static void ses_get_fault(struct enclosure_device *edev,
- 			  struct enclosure_component *ecomp)
- {
-@@ -178,7 +182,7 @@ static int ses_set_fault(struct enclosure_device *edev,
- 		/* zero is disabled */
- 		break;
- 	case ENCLOSURE_SETTING_ENABLED:
--		desc[2] = 0x02;
-+		desc[3] = 0x20;
- 		break;
- 	default:
- 		/* SES doesn't do the SGPIO blink settings */
-diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
-index aaad76e..80a1071 100644
---- a/drivers/staging/comedi/comedi_fops.c
-+++ b/drivers/staging/comedi/comedi_fops.c
-@@ -367,8 +367,8 @@ static int do_devinfo_ioctl(struct comedi_device *dev,
- 	/* fill devinfo structure */
- 	devinfo.version_code = COMEDI_VERSION_CODE;
- 	devinfo.n_subdevs = dev->n_subdevices;
--	memcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN);
--	memcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN);
-+	strlcpy(devinfo.driver_name, dev->driver->driver_name, COMEDI_NAMELEN);
-+	strlcpy(devinfo.board_name, dev->board_name, COMEDI_NAMELEN);
- 
- 	if (read_subdev)
- 		devinfo.read_subdevice = read_subdev - dev->subdevices;
-diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
-index 5e09664..7adb671 100644
---- a/drivers/usb/gadget/dummy_hcd.c
-+++ b/drivers/usb/gadget/dummy_hcd.c
-@@ -1886,6 +1886,7 @@ static int dummy_hcd_probe(struct platform_device *pdev)
- 	if (!hcd)
- 		return -ENOMEM;
- 	the_controller = hcd_to_dummy (hcd);
-+	hcd->has_tt = 1;
- 
- 	retval = usb_add_hcd(hcd, 0, 0);
- 	if (retval != 0) {
-diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
-index 6ac3976..1bcf6ee 100644
---- a/drivers/usb/host/ehci-hub.c
-+++ b/drivers/usb/host/ehci-hub.c
-@@ -758,10 +758,11 @@ static int ehci_hub_control (
- 			 * power switching; they're allowed to just limit the
- 			 * current.  khubd will turn the power back on.
- 			 */
--			if (HCS_PPC (ehci->hcs_params)){
-+			if ((temp & PORT_OC) && HCS_PPC(ehci->hcs_params)) {
- 				ehci_writel(ehci,
- 					temp & ~(PORT_RWC_BITS | PORT_POWER),
- 					status_reg);
-+				temp = ehci_readl(ehci, status_reg);
- 			}
- 		}
- 
-diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
-index f51345f..0ee5b4b 100644
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -103,7 +103,7 @@ qh_update (struct ehci_hcd *ehci, struct ehci_qh *qh, struct ehci_qtd *qtd)
- 	if (!(hw->hw_info1 & cpu_to_hc32(ehci, 1 << 14))) {
- 		unsigned	is_out, epnum;
- 
--		is_out = !(qtd->hw_token & cpu_to_hc32(ehci, 1 << 8));
-+		is_out = qh->is_out;
- 		epnum = (hc32_to_cpup(ehci, &hw->hw_info1) >> 8) & 0x0f;
- 		if (unlikely (!usb_gettoggle (qh->dev, epnum, is_out))) {
- 			hw->hw_token &= ~cpu_to_hc32(ehci, QTD_TOGGLE);
-@@ -923,6 +923,7 @@ done:
- 	hw = qh->hw;
- 	hw->hw_info1 = cpu_to_hc32(ehci, info1);
- 	hw->hw_info2 = cpu_to_hc32(ehci, info2);
-+	qh->is_out = !is_input;
- 	usb_settoggle (urb->dev, usb_pipeendpoint (urb->pipe), !is_input, 1);
- 	qh_refresh (ehci, qh);
- 	return qh;
-diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
-index ac321ef..5b3ca74 100644
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -366,6 +366,7 @@ struct ehci_qh {
- #define NO_FRAME ((unsigned short)~0)			/* pick new start */
- 
- 	struct usb_device	*dev;		/* access to TT */
-+	unsigned		is_out:1;	/* bulk or intr OUT */
- 	unsigned		clearing_tt:1;	/* Clear-TT-Buf in progress */
- };
- 
-diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
-index 464ed97..bcf7a88 100644
---- a/drivers/usb/host/pci-quirks.c
-+++ b/drivers/usb/host/pci-quirks.c
-@@ -34,6 +34,8 @@
- #define OHCI_INTRSTATUS		0x0c
- #define OHCI_INTRENABLE		0x10
- #define OHCI_INTRDISABLE	0x14
-+#define OHCI_FMINTERVAL		0x34
-+#define OHCI_HCR		(1 << 0)	/* host controller reset */
- #define OHCI_OCR		(1 << 3)	/* ownership change request */
- #define OHCI_CTRL_RWC		(1 << 9)	/* remote wakeup connected */
- #define OHCI_CTRL_IR		(1 << 8)	/* interrupt routing */
-@@ -204,6 +206,32 @@ static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
- 
- 	/* reset controller, preserving RWC (and possibly IR) */
- 	writel(control & OHCI_CTRL_MASK, base + OHCI_CONTROL);
-+	readl(base + OHCI_CONTROL);
-+
-+	/* Some NVIDIA controllers stop working if kept in RESET for too long */
-+	if (pdev->vendor == PCI_VENDOR_ID_NVIDIA) {
-+		u32 fminterval;
-+		int cnt;
-+
-+		/* drive reset for at least 50 ms (7.1.7.5) */
-+		msleep(50);
-+
-+		/* software reset of the controller, preserving HcFmInterval */
-+		fminterval = readl(base + OHCI_FMINTERVAL);
-+		writel(OHCI_HCR, base + OHCI_CMDSTATUS);
-+
-+		/* reset requires max 10 us delay */
-+		for (cnt = 30; cnt > 0; --cnt) {	/* ... allow extra time */
-+			if ((readl(base + OHCI_CMDSTATUS) & OHCI_HCR) == 0)
-+				break;
-+			udelay(1);
-+		}
-+		writel(fminterval, base + OHCI_FMINTERVAL);
-+
-+		/* Now we're in the SUSPEND state with all devices reset
-+		 * and wakeups and interrupts disabled
-+		 */
-+	}
- 
- 	/*
- 	 * disable interrupts
-diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
-index 24212be..b9afd6a 100644
---- a/drivers/usb/musb/musb_core.c
-+++ b/drivers/usb/musb/musb_core.c
-@@ -1634,6 +1634,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit)
- 			}
- 		}
- 	}
-+	musb_writeb(musb_base, MUSB_INDEX, musb->context.index);
- }
- 
- #else
-diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
-index b336017..4a18fd2 100644
---- a/drivers/usb/serial/pl2303.c
-+++ b/drivers/usb/serial/pl2303.c
-@@ -100,6 +100,8 @@ static struct usb_device_id id_table [] = {
- 	{ USB_DEVICE(ZEAGLE_VENDOR_ID, ZEAGLE_N2ITION3_PRODUCT_ID) },
- 	{ USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) },
- 	{ USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) },
-+	{ USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) },
-+	{ USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) },
- 	{ }					/* Terminating entry */
- };
- 
-diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
-index 4d043e4..ca0d237 100644
---- a/drivers/usb/serial/pl2303.h
-+++ b/drivers/usb/serial/pl2303.h
-@@ -5,7 +5,7 @@
-  *	it under the terms of the GNU General Public License as published by
-  *	the Free Software Foundation; either version 2 of the License, or
-  *	(at your option) any later version.
-- * 
-+ *
-  */
- 
- #define BENQ_VENDOR_ID			0x04a5
-@@ -140,3 +140,11 @@
- /* Sanwa KB-USB2 multimeter cable (ID: 11ad:0001) */
- #define SANWA_VENDOR_ID		0x11ad
- #define SANWA_PRODUCT_ID	0x0001
-+
-+/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */
-+#define ADLINK_VENDOR_ID		0x0b63
-+#define ADLINK_ND6530_PRODUCT_ID	0x6530
-+
-+/* WinChipHead USB->RS 232 adapter */
-+#define WINCHIPHEAD_VENDOR_ID		0x4348
-+#define WINCHIPHEAD_USBSER_PRODUCT_ID	0x5523
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 16cea86..e65efa2 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -1203,7 +1203,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 			if (!bdev->bd_part)
- 				goto out_clear;
- 
--			ret = 0;
- 			if (disk->fops->open) {
- 				ret = disk->fops->open(bdev, mode);
- 				if (ret == -ERESTARTSYS) {
-@@ -1219,18 +1218,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 					mutex_unlock(&bdev->bd_mutex);
- 					goto restart;
- 				}
-+				if (ret)
-+					goto out_clear;
- 			}
--			/*
--			 * If the device is invalidated, rescan partition
--			 * if open succeeded or failed with -ENOMEDIUM.
--			 * The latter is necessary to prevent ghost
--			 * partitions on a removed medium.
--			 */
--			if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM))
--				rescan_partitions(disk, bdev);
--			if (ret)
--				goto out_clear;
--
- 			if (!bdev->bd_openers) {
- 				bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
- 				bdi = blk_get_backing_dev_info(bdev);
-@@ -1238,6 +1228,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 					bdi = &default_backing_dev_info;
- 				bdev->bd_inode->i_data.backing_dev_info = bdi;
- 			}
-+			if (bdev->bd_invalidated)
-+				rescan_partitions(disk, bdev);
- 		} else {
- 			struct block_device *whole;
- 			whole = bdget_disk(disk, 0);
-@@ -1264,14 +1256,13 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- 		put_disk(disk);
- 		disk = NULL;
- 		if (bdev->bd_contains == bdev) {
--			ret = 0;
--			if (bdev->bd_disk->fops->open)
-+			if (bdev->bd_disk->fops->open) {
- 				ret = bdev->bd_disk->fops->open(bdev, mode);
--			/* the same as first opener case, read comment there */
--			if (bdev->bd_invalidated && (!ret || ret == -ENOMEDIUM))
-+				if (ret)
-+					goto out_unlock_bdev;
-+			}
-+			if (bdev->bd_invalidated)
- 				rescan_partitions(bdev->bd_disk, bdev);
--			if (ret)
--				goto out_unlock_bdev;
- 		}
- 	}
- 	bdev->bd_openers++;
-diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
-index c4dbc63..e29581e 100644
---- a/fs/cifs/cifsglob.h
-+++ b/fs/cifs/cifsglob.h
-@@ -33,7 +33,7 @@
- #define MAX_SHARE_SIZE  64	/* used to be 20, this should still be enough */
- #define MAX_USERNAME_SIZE 32	/* 32 is to allow for 15 char names + null
- 				   termination then *2 for unicode versions */
--#define MAX_PASSWORD_SIZE 16
-+#define MAX_PASSWORD_SIZE 512  /* max for windows seems to be 256 wide chars */
- 
- #define CIFS_MIN_RCV_POOL 4
- 
-diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
-index 6234417..b6bb82e 100644
---- a/fs/cifs/connect.c
-+++ b/fs/cifs/connect.c
-@@ -1588,17 +1588,29 @@ out_err:
- }
- 
- static struct cifsSesInfo *
--cifs_find_smb_ses(struct TCP_Server_Info *server, char *username)
-+cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
- {
--	struct list_head *tmp;
- 	struct cifsSesInfo *ses;
- 
- 	write_lock(&cifs_tcp_ses_lock);
--	list_for_each(tmp, &server->smb_ses_list) {
--		ses = list_entry(tmp, struct cifsSesInfo, smb_ses_list);
--		if (strncmp(ses->userName, username, MAX_USERNAME_SIZE))
--			continue;
--
-+	list_for_each_entry(ses, &server->smb_ses_list, smb_ses_list) {
-+		switch (server->secType) {
-+		case Kerberos:
-+			if (vol->linux_uid != ses->linux_uid)
-+				continue;
-+			break;
-+		default:
-+			/* anything else takes username/password */
-+			if (strncmp(ses->userName, vol->username,
-+				    MAX_USERNAME_SIZE))
-+				continue;
-+			if (strlen(vol->username) != 0 &&
-+			    ses->password != NULL &&
-+			    strncmp(ses->password,
-+				    vol->password ? vol->password : "",
-+				    MAX_PASSWORD_SIZE))
-+				continue;
-+		}
- 		++ses->ses_count;
- 		write_unlock(&cifs_tcp_ses_lock);
- 		return ses;
-@@ -2362,7 +2374,7 @@ try_mount_again:
- 		goto out;
- 	}
- 
--	pSesInfo = cifs_find_smb_ses(srvTcp, volume_info->username);
-+	pSesInfo = cifs_find_smb_ses(srvTcp, volume_info);
- 	if (pSesInfo) {
- 		cFYI(1, ("Existing smb sess found (status=%d)",
- 			pSesInfo->status));
-diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
-index 387d92d..d7add4c 100644
---- a/fs/ext3/xattr.c
-+++ b/fs/ext3/xattr.c
-@@ -800,8 +800,16 @@ inserted:
- 			/* We need to allocate a new block */
- 			ext3_fsblk_t goal = ext3_group_first_block_no(sb,
- 						EXT3_I(inode)->i_block_group);
--			ext3_fsblk_t block = ext3_new_block(handle, inode,
--							goal, &error);
-+			ext3_fsblk_t block;
-+
-+			/*
-+			 * Protect us agaist concurrent allocations to the
-+			 * same inode from ext3_..._writepage(). Reservation
-+			 * code does not expect racing allocations.
-+			 */
-+			mutex_lock(&EXT3_I(inode)->truncate_mutex);
-+			block = ext3_new_block(handle, inode, goal, &error);
-+			mutex_unlock(&EXT3_I(inode)->truncate_mutex);
- 			if (error)
- 				goto cleanup;
- 			ea_idebug(inode, "creating block %d", block);
-diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
-index e81b2bf..7ee8ebc 100644
---- a/fs/nfs/nfs4xdr.c
-+++ b/fs/nfs/nfs4xdr.c
-@@ -88,7 +88,7 @@ static int nfs4_stat_to_errno(int);
- #define encode_getfh_maxsz      (op_encode_hdr_maxsz)
- #define decode_getfh_maxsz      (op_decode_hdr_maxsz + 1 + \
- 				((3+NFS4_FHSIZE) >> 2))
--#define nfs4_fattr_bitmap_maxsz 3
-+#define nfs4_fattr_bitmap_maxsz 4
- #define encode_getattr_maxsz    (op_encode_hdr_maxsz + nfs4_fattr_bitmap_maxsz)
- #define nfs4_name_maxsz		(1 + ((3 + NFS4_MAXNAMLEN) >> 2))
- #define nfs4_path_maxsz		(1 + ((3 + NFS4_MAXPATHLEN) >> 2))
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 3d09a10..7b5819c 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2454,6 +2454,9 @@ static int do_io_accounting(struct task_struct *task, char *buffer, int whole)
- 	struct task_io_accounting acct = task->ioac;
- 	unsigned long flags;
- 
-+	if (!ptrace_may_access(task, PTRACE_MODE_READ))
-+		return -EACCES;
-+
- 	if (whole && lock_task_sighand(task, &flags)) {
- 		struct task_struct *t = task;
- 
-@@ -2575,7 +2578,7 @@ static const struct pid_entry tgid_base_stuff[] = {
- 	REG("coredump_filter", S_IRUGO|S_IWUSR, proc_coredump_filter_operations),
- #endif
- #ifdef CONFIG_TASK_IO_ACCOUNTING
--	INF("io",	S_IRUGO, proc_tgid_io_accounting),
-+	INF("io",	S_IRUSR, proc_tgid_io_accounting),
- #endif
- };
- 
-@@ -2910,7 +2913,7 @@ static const struct pid_entry tid_base_stuff[] = {
- 	REG("make-it-fail", S_IRUGO|S_IWUSR, proc_fault_inject_operations),
- #endif
- #ifdef CONFIG_TASK_IO_ACCOUNTING
--	INF("io",	S_IRUGO, proc_tid_io_accounting),
-+	INF("io",	S_IRUSR, proc_tid_io_accounting),
- #endif
- };
- 
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index c27a182..9d7e8f7 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1164,9 +1164,12 @@ static inline int skb_gro_header_hard(struct sk_buff *skb, unsigned int hlen)
- static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
- 					unsigned int offset)
- {
-+	if (!pskb_may_pull(skb, hlen))
-+		return NULL;
-+
- 	NAPI_GRO_CB(skb)->frag0 = NULL;
- 	NAPI_GRO_CB(skb)->frag0_len = 0;
--	return pskb_may_pull(skb, hlen) ? skb->data + offset : NULL;
-+	return skb->data + offset;
- }
- 
- static inline void *skb_gro_mac_header(struct sk_buff *skb)
-diff --git a/kernel/perf_event.c b/kernel/perf_event.c
-index fc5ab8e..37ebc14 100644
---- a/kernel/perf_event.c
-+++ b/kernel/perf_event.c
-@@ -3694,12 +3694,8 @@ static int __perf_event_overflow(struct perf_event *event, int nmi,
- 	if (events && atomic_dec_and_test(&event->event_limit)) {
- 		ret = 1;
- 		event->pending_kill = POLL_HUP;
--		if (nmi) {
--			event->pending_disable = 1;
--			perf_pending_queue(&event->pending,
--					   perf_pending_event);
--		} else
--			perf_event_disable(event);
-+		event->pending_disable = 1;
-+		perf_pending_queue(&event->pending, perf_pending_event);
- 	}
- 
- 	perf_event_output(event, nmi, data, regs);
-diff --git a/net/atm/br2684.c b/net/atm/br2684.c
-index 26a646d..c9230c3 100644
---- a/net/atm/br2684.c
-+++ b/net/atm/br2684.c
-@@ -554,6 +554,12 @@ static const struct net_device_ops br2684_netdev_ops = {
- 	.ndo_validate_addr	= eth_validate_addr,
- };
- 
-+static const struct net_device_ops br2684_netdev_ops_routed = {
-+	.ndo_start_xmit 	= br2684_start_xmit,
-+	.ndo_set_mac_address	= br2684_mac_addr,
-+	.ndo_change_mtu		= eth_change_mtu
-+};
-+
- static void br2684_setup(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
-@@ -569,11 +575,10 @@ static void br2684_setup(struct net_device *netdev)
- static void br2684_setup_routed(struct net_device *netdev)
- {
- 	struct br2684_dev *brdev = BRPRIV(netdev);
--	brdev->net_dev = netdev;
- 
-+	brdev->net_dev = netdev;
- 	netdev->hard_header_len = 0;
--
--	netdev->netdev_ops = &br2684_netdev_ops;
-+	netdev->netdev_ops = &br2684_netdev_ops_routed;
- 	netdev->addr_len = 0;
- 	netdev->mtu = 1500;
- 	netdev->type = ARPHRD_PPP;
-diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
-index 2114e45..8567d47 100644
---- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -75,6 +75,7 @@ struct net_bridge_port
- 	bridge_id			designated_bridge;
- 	u32				path_cost;
- 	u32				designated_cost;
-+	unsigned long			designated_age;
- 
- 	struct timer_list		forward_delay_timer;
- 	struct timer_list		hold_timer;
-diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
-index fd3f8d6..c7d6bfc 100644
---- a/net/bridge/br_stp.c
-+++ b/net/bridge/br_stp.c
-@@ -165,8 +165,7 @@ void br_transmit_config(struct net_bridge_port *p)
- 	else {
- 		struct net_bridge_port *root
- 			= br_get_port(br, br->root_port);
--		bpdu.message_age = br->max_age
--			- (root->message_age_timer.expires - jiffies)
-+		bpdu.message_age = (jiffies - root->designated_age)
- 			+ MESSAGE_AGE_INCR;
- 	}
- 	bpdu.max_age = br->max_age;
-@@ -190,6 +189,7 @@ static inline void br_record_config_information(struct net_bridge_port *p,
- 	p->designated_cost = bpdu->root_path_cost;
- 	p->designated_bridge = bpdu->bridge_id;
- 	p->designated_port = bpdu->port_id;
-+	p->designated_age = jiffies + bpdu->message_age;
- 
- 	mod_timer(&p->message_age_timer, jiffies
- 		  + (p->br->max_age - bpdu->message_age));
-diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index cfab9e4..f614584 100644
---- a/net/ipv4/ip_gre.c
-+++ b/net/ipv4/ip_gre.c
-@@ -1665,14 +1665,15 @@ static int __init ipgre_init(void)
- 
- 	printk(KERN_INFO "GRE over IPv4 tunneling driver\n");
- 
--	if (inet_add_protocol(&ipgre_protocol, IPPROTO_GRE) < 0) {
--		printk(KERN_INFO "ipgre init: can't add protocol\n");
--		return -EAGAIN;
--	}
--
- 	err = register_pernet_gen_device(&ipgre_net_id, &ipgre_net_ops);
- 	if (err < 0)
--		goto gen_device_failed;
-+		return err;
-+
-+	err = inet_add_protocol(&ipgre_protocol, IPPROTO_GRE);
-+	if (err < 0) {
-+		printk(KERN_INFO "ipgre init: can't add protocol\n");
-+		goto add_proto_failed;
-+	}
- 
- 	err = rtnl_link_register(&ipgre_link_ops);
- 	if (err < 0)
-@@ -1688,9 +1689,9 @@ out:
- tap_ops_failed:
- 	rtnl_link_unregister(&ipgre_link_ops);
- rtnl_link_failed:
--	unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
--gen_device_failed:
- 	inet_del_protocol(&ipgre_protocol, IPPROTO_GRE);
-+add_proto_failed:
-+	unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
- 	goto out;
- }
- 
-@@ -1698,9 +1699,9 @@ static void __exit ipgre_fini(void)
- {
- 	rtnl_link_unregister(&ipgre_tap_ops);
- 	rtnl_link_unregister(&ipgre_link_ops);
--	unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
- 	if (inet_del_protocol(&ipgre_protocol, IPPROTO_GRE) < 0)
- 		printk(KERN_INFO "ipgre close: can't remove protocol\n");
-+	unregister_pernet_gen_device(ipgre_net_id, &ipgre_net_ops);
- }
- 
- module_init(ipgre_init);
-diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index f37df1a..860b5c5 100644
---- a/net/ipv4/ipip.c
-+++ b/net/ipv4/ipip.c
-@@ -830,15 +830,14 @@ static int __init ipip_init(void)
- 
- 	printk(banner);
- 
--	if (xfrm4_tunnel_register(&ipip_handler, AF_INET)) {
-+	err = register_pernet_gen_device(&ipip_net_id, &ipip_net_ops);
-+	if (err < 0)
-+		return err;
-+	err = xfrm4_tunnel_register(&ipip_handler, AF_INET);
-+	if (err < 0) {
-+		unregister_pernet_device(&ipip_net_ops);
- 		printk(KERN_INFO "ipip init: can't register tunnel\n");
--		return -EAGAIN;
- 	}
--
--	err = register_pernet_gen_device(&ipip_net_id, &ipip_net_ops);
--	if (err)
--		xfrm4_tunnel_deregister(&ipip_handler, AF_INET);
--
- 	return err;
- }
- 
-diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 9a95c82..7fb3e02 100644
---- a/net/ipv6/ip6_tunnel.c
-+++ b/net/ipv6/ip6_tunnel.c
-@@ -1466,27 +1466,29 @@ static int __init ip6_tunnel_init(void)
- {
- 	int  err;
- 
--	if (xfrm6_tunnel_register(&ip4ip6_handler, AF_INET)) {
-+	err = register_pernet_device(&ip6_tnl_net_ops);
-+	if (err < 0)
-+		goto out_pernet;
-+
-+	err = xfrm6_tunnel_register(&ip4ip6_handler, AF_INET);
-+	if (err < 0) {
- 		printk(KERN_ERR "ip6_tunnel init: can't register ip4ip6\n");
--		err = -EAGAIN;
--		goto out;
-+		goto out_ip4ip6;
- 	}
- 
--	if (xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6)) {
-+	err = xfrm6_tunnel_register(&ip6ip6_handler, AF_INET6);
-+	if (err < 0) {
- 		printk(KERN_ERR "ip6_tunnel init: can't register ip6ip6\n");
--		err = -EAGAIN;
--		goto unreg_ip4ip6;
-+		goto out_ip6ip6;
- 	}
- 
--	err = register_pernet_gen_device(&ip6_tnl_net_id, &ip6_tnl_net_ops);
--	if (err < 0)
--		goto err_pernet;
- 	return 0;
--err_pernet:
--	xfrm6_tunnel_deregister(&ip6ip6_handler, AF_INET6);
--unreg_ip4ip6:
-+
-+out_ip6ip6:
- 	xfrm6_tunnel_deregister(&ip4ip6_handler, AF_INET);
--out:
-+out_ip4ip6:
-+	unregister_pernet_device(&ip6_tnl_net_ops);
-+out_pernet:
- 	return err;
- }
- 
-diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
-index de2ffef..b128c07 100644
---- a/net/ipv6/sit.c
-+++ b/net/ipv6/sit.c
-@@ -1086,15 +1086,14 @@ static int __init sit_init(void)
- 
- 	printk(KERN_INFO "IPv6 over IPv4 tunneling driver\n");
- 
--	if (xfrm4_tunnel_register(&sit_handler, AF_INET6) < 0) {
--		printk(KERN_INFO "sit init: Can't add protocol\n");
--		return -EAGAIN;
--	}
--
- 	err = register_pernet_gen_device(&sit_net_id, &sit_net_ops);
- 	if (err < 0)
--		xfrm4_tunnel_deregister(&sit_handler, AF_INET6);
--
-+		return err;
-+	err = xfrm4_tunnel_register(&sit_handler, AF_INET6);
-+	if (err < 0) {
-+		unregister_pernet_device(&sit_net_ops);
-+		printk(KERN_INFO "sit init: Can't add protocol\n");
-+	}
- 	return err;
- }
- 
-diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
-index 81a95c0..48bb1e3 100644
---- a/net/ipv6/xfrm6_tunnel.c
-+++ b/net/ipv6/xfrm6_tunnel.c
-@@ -344,32 +344,38 @@ static struct xfrm6_tunnel xfrm46_tunnel_handler = {
- 
- static int __init xfrm6_tunnel_init(void)
- {
--	if (xfrm_register_type(&xfrm6_tunnel_type, AF_INET6) < 0)
-+	int rv;
-+
-+	rv = xfrm6_tunnel_spi_init();
-+	if (rv < 0)
- 		goto err;
--	if (xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6))
--		goto unreg;
--	if (xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET))
--		goto dereg6;
--	if (xfrm6_tunnel_spi_init() < 0)
--		goto dereg46;
-+	rv = xfrm_register_type(&xfrm6_tunnel_type, AF_INET6);
-+	if (rv < 0)
-+		goto out_type;
-+	rv = xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6);
-+	if (rv < 0)
-+		goto out_xfrm6;
-+	rv = xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET);
-+	if (rv < 0)
-+		goto out_xfrm46;
- 	return 0;
- 
--dereg46:
--	xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
--dereg6:
-+out_xfrm46:
- 	xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
--unreg:
-+out_xfrm6:
- 	xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-+out_type:
-+	xfrm6_tunnel_spi_fini();
- err:
--	return -EAGAIN;
-+	return rv;
- }
- 
- static void __exit xfrm6_tunnel_fini(void)
- {
--	xfrm6_tunnel_spi_fini();
- 	xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
- 	xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
- 	xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
-+	xfrm6_tunnel_spi_fini();
- }
- 
- module_init(xfrm6_tunnel_init);
-diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
-index 5bea319..e67eea7 100644
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -2308,6 +2308,9 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
- {
- 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
- 
-+	if (!ifmgd->associated)
-+		return;
-+
- 	if (test_and_clear_bit(TMR_RUNNING_TIMER, &ifmgd->timers_running))
- 		add_timer(&ifmgd->timer);
- 	if (test_and_clear_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running))
-diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
-index 830faf4..4418bb4 100644
---- a/net/sunrpc/rpcb_clnt.c
-+++ b/net/sunrpc/rpcb_clnt.c
-@@ -533,7 +533,7 @@ void rpcb_getport_async(struct rpc_task *task)
- 	u32 bind_version;
- 	struct rpc_xprt *xprt;
- 	struct rpc_clnt	*rpcb_clnt;
--	static struct rpcbind_args *map;
-+	struct rpcbind_args *map;
- 	struct rpc_task	*child;
- 	struct sockaddr_storage addr;
- 	struct sockaddr *sap = (struct sockaddr *)&addr;
-diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index 9191b2f..570da30 100644
---- a/net/sunrpc/sched.c
-+++ b/net/sunrpc/sched.c
-@@ -613,30 +613,25 @@ static void __rpc_execute(struct rpc_task *task)
- 	BUG_ON(RPC_IS_QUEUED(task));
- 
- 	for (;;) {
-+		void (*do_action)(struct rpc_task *);
- 
- 		/*
--		 * Execute any pending callback.
-+		 * Execute any pending callback first.
- 		 */
--		if (task->tk_callback) {
--			void (*save_callback)(struct rpc_task *);
--
--			/*
--			 * We set tk_callback to NULL before calling it,
--			 * in case it sets the tk_callback field itself:
--			 */
--			save_callback = task->tk_callback;
--			task->tk_callback = NULL;
--			save_callback(task);
--		} else {
-+		do_action = task->tk_callback;
-+		task->tk_callback = NULL;
-+		if (do_action == NULL) {
- 			/*
- 			 * Perform the next FSM step.
--			 * tk_action may be NULL when the task has been killed
--			 * by someone else.
-+			 * tk_action may be NULL if the task has been killed.
-+			 * In particular, note that rpc_killall_tasks may
-+			 * do this at any time, so beware when dereferencing.
- 			 */
--			if (task->tk_action == NULL)
-+			do_action = task->tk_action;
-+			if (do_action == NULL)
- 				break;
--			task->tk_action(task);
- 		}
-+		do_action(task);
- 
- 		/*
- 		 * Lockless check for whether task is sleeping or not.
-diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
-index df760ad..cc1fb36 100644
---- a/net/sunrpc/svc_xprt.c
-+++ b/net/sunrpc/svc_xprt.c
-@@ -896,12 +896,13 @@ void svc_delete_xprt(struct svc_xprt *xprt)
- 	if (!test_and_set_bit(XPT_DETACHED, &xprt->xpt_flags))
- 		list_del_init(&xprt->xpt_list);
- 	/*
--	 * We used to delete the transport from whichever list
--	 * it's sk_xprt.xpt_ready node was on, but we don't actually
--	 * need to.  This is because the only time we're called
--	 * while still attached to a queue, the queue itself
--	 * is about to be destroyed (in svc_destroy).
-+	 * The only time we're called while xpt_ready is still on a list
-+	 * is while the list itself is about to be destroyed (in
-+	 * svc_destroy).  BUT svc_xprt_enqueue could still be attempting
-+	 * to add new entries to the sp_sockets list, so we can't leave
-+	 * a freed xprt on it.
- 	 */
-+	list_del_init(&xprt->xpt_ready);
- 	if (test_bit(XPT_TEMP, &xprt->xpt_flags))
- 		serv->sv_tmpcnt--;
- 
-diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
-index 08bfed5..038232d 100644
---- a/sound/core/pcm_compat.c
-+++ b/sound/core/pcm_compat.c
-@@ -341,7 +341,7 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
- 			kfree(bufs);
- 			return -EFAULT;
- 		}
--		bufs[ch] = compat_ptr(ptr);
-+		bufs[i] = compat_ptr(ptr);
- 		bufptr++;
- 	}
- 	if (dir == SNDRV_PCM_STREAM_PLAYBACK)
-diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c
-index 62fbb84..77dae16 100644
---- a/sound/soc/blackfin/bf5xx-i2s-pcm.c
-+++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c
-@@ -139,11 +139,20 @@ static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream)
- 	pr_debug("%s enter\n", __func__);
- 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- 		diff = sport_curr_offset_tx(sport);
--		frames = bytes_to_frames(substream->runtime, diff);
- 	} else {
- 		diff = sport_curr_offset_rx(sport);
--		frames = bytes_to_frames(substream->runtime, diff);
- 	}
-+
-+	/*
-+	 * TX at least can report one frame beyond the end of the
-+	 * buffer if we hit the wraparound case - clamp to within the
-+	 * buffer as the ALSA APIs require.
-+	 */
-+	if (diff == snd_pcm_lib_buffer_bytes(substream))
-+		diff = 0;
-+
-+	frames = bytes_to_frames(substream->runtime, diff);
-+
- 	return frames;
- }
- 
diff --git a/2.6.32/1044_linux-2.6.32.45.patch b/2.6.32/1044_linux-2.6.32.45.patch
deleted file mode 100644
index bc45921..0000000
--- a/2.6.32/1044_linux-2.6.32.45.patch
+++ /dev/null
@@ -1,1051 +0,0 @@
-diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
-index bafac2e..2edcfed 100644
---- a/arch/powerpc/kernel/prom_init.c
-+++ b/arch/powerpc/kernel/prom_init.c
-@@ -890,7 +890,7 @@ static unsigned long __init alloc_up(unsigned long size, unsigned long align)
- 	}
- 	if (addr == 0)
- 		return 0;
--	RELOC(alloc_bottom) = addr;
-+	RELOC(alloc_bottom) = addr + size;
- 
- 	prom_debug(" -> %x\n", addr);
- 	prom_debug("  alloc_bottom : %x\n", RELOC(alloc_bottom));
-@@ -1704,7 +1704,7 @@ static void __init *make_room(unsigned long *mem_start, unsigned long *mem_end,
- 		chunk = alloc_up(room, 0);
- 		if (chunk == 0)
- 			prom_panic("No memory for flatten_device_tree (claim failed)");
--		*mem_end = RELOC(alloc_top);
-+		*mem_end = chunk + room;
- 	}
- 
- 	ret = (void *)*mem_start;
-@@ -1923,7 +1923,7 @@ static void __init flatten_device_tree(void)
- 	mem_start = (unsigned long)alloc_up(room, PAGE_SIZE);
- 	if (mem_start == 0)
- 		prom_panic("Can't allocate initial device-tree chunk\n");
--	mem_end = RELOC(alloc_top);
-+	mem_end = mem_start + room;
- 
- 	/* Get root of tree */
- 	root = call_prom("peer", 1, 1, (phandle)0);
-diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
-index 5f2c511..d5db4c6 100644
---- a/arch/powerpc/platforms/pseries/lpar.c
-+++ b/arch/powerpc/platforms/pseries/lpar.c
-@@ -371,7 +371,7 @@ static void pSeries_lpar_hptab_clear(void)
- 		unsigned long ptel;
- 	} ptes[4];
- 	long lpar_rc;
--	int i, j;
-+	unsigned long i, j;
- 
- 	/* Read in batches of 4,
- 	 * invalidate only valid entries not in the VRMA
-diff --git a/crypto/md5.c b/crypto/md5.c
-index 83eb529..156b6bc 100644
---- a/crypto/md5.c
-+++ b/crypto/md5.c
-@@ -20,6 +20,7 @@
- #include <linux/module.h>
- #include <linux/string.h>
- #include <linux/types.h>
-+#include <linux/cryptohash.h>
- #include <asm/byteorder.h>
- 
- #define MD5_DIGEST_SIZE		16
-@@ -27,103 +28,12 @@
- #define MD5_BLOCK_WORDS		16
- #define MD5_HASH_WORDS		4
- 
--#define F1(x, y, z)	(z ^ (x & (y ^ z)))
--#define F2(x, y, z)	F1(z, x, y)
--#define F3(x, y, z)	(x ^ y ^ z)
--#define F4(x, y, z)	(y ^ (x | ~z))
--
--#define MD5STEP(f, w, x, y, z, in, s) \
--	(w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x)
--
- struct md5_ctx {
- 	u32 hash[MD5_HASH_WORDS];
- 	u32 block[MD5_BLOCK_WORDS];
- 	u64 byte_count;
- };
- 
--static void md5_transform(u32 *hash, u32 const *in)
--{
--	u32 a, b, c, d;
--
--	a = hash[0];
--	b = hash[1];
--	c = hash[2];
--	d = hash[3];
--
--	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
--	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
--	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
--	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
--	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
--	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
--	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
--	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
--	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
--	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
--	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
--	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
--	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
--	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
--	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
--	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
--
--	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
--	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
--	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
--	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
--	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
--	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
--	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
--	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
--	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
--	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
--	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
--	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
--	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
--	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
--	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
--	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
--
--	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
--	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
--	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
--	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
--	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
--	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
--	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
--	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
--	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
--	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
--	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
--	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
--	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
--	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
--	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
--	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
--
--	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
--	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
--	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
--	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
--	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
--	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
--	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
--	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
--	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
--	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
--	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
--	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
--	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
--	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
--	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
--	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
--
--	hash[0] += a;
--	hash[1] += b;
--	hash[2] += c;
--	hash[3] += d;
--}
--
- /* XXX: this stuff can be optimized */
- static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
- {
-diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 908ac1f..3a19e2d 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -1339,330 +1339,14 @@ ctl_table random_table[] = {
- };
- #endif 	/* CONFIG_SYSCTL */
- 
--/********************************************************************
-- *
-- * Random funtions for networking
-- *
-- ********************************************************************/
--
--/*
-- * TCP initial sequence number picking.  This uses the random number
-- * generator to pick an initial secret value.  This value is hashed
-- * along with the TCP endpoint information to provide a unique
-- * starting point for each pair of TCP endpoints.  This defeats
-- * attacks which rely on guessing the initial TCP sequence number.
-- * This algorithm was suggested by Steve Bellovin.
-- *
-- * Using a very strong hash was taking an appreciable amount of the total
-- * TCP connection establishment time, so this is a weaker hash,
-- * compensated for by changing the secret periodically.
-- */
--
--/* F, G and H are basic MD4 functions: selection, majority, parity */
--#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
--#define G(x, y, z) (((x) & (y)) + (((x) ^ (y)) & (z)))
--#define H(x, y, z) ((x) ^ (y) ^ (z))
--
--/*
-- * The generic round function.  The application is so specific that
-- * we don't bother protecting all the arguments with parens, as is generally
-- * good macro practice, in favor of extra legibility.
-- * Rotation is separate from addition to prevent recomputation
-- */
--#define ROUND(f, a, b, c, d, x, s)	\
--	(a += f(b, c, d) + x, a = (a << s) | (a >> (32 - s)))
--#define K1 0
--#define K2 013240474631UL
--#define K3 015666365641UL
-+static u32 random_int_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned;
- 
--#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
--
--static __u32 twothirdsMD4Transform(__u32 const buf[4], __u32 const in[12])
-+static int __init random_int_secret_init(void)
- {
--	__u32 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
--
--	/* Round 1 */
--	ROUND(F, a, b, c, d, in[ 0] + K1,  3);
--	ROUND(F, d, a, b, c, in[ 1] + K1,  7);
--	ROUND(F, c, d, a, b, in[ 2] + K1, 11);
--	ROUND(F, b, c, d, a, in[ 3] + K1, 19);
--	ROUND(F, a, b, c, d, in[ 4] + K1,  3);
--	ROUND(F, d, a, b, c, in[ 5] + K1,  7);
--	ROUND(F, c, d, a, b, in[ 6] + K1, 11);
--	ROUND(F, b, c, d, a, in[ 7] + K1, 19);
--	ROUND(F, a, b, c, d, in[ 8] + K1,  3);
--	ROUND(F, d, a, b, c, in[ 9] + K1,  7);
--	ROUND(F, c, d, a, b, in[10] + K1, 11);
--	ROUND(F, b, c, d, a, in[11] + K1, 19);
--
--	/* Round 2 */
--	ROUND(G, a, b, c, d, in[ 1] + K2,  3);
--	ROUND(G, d, a, b, c, in[ 3] + K2,  5);
--	ROUND(G, c, d, a, b, in[ 5] + K2,  9);
--	ROUND(G, b, c, d, a, in[ 7] + K2, 13);
--	ROUND(G, a, b, c, d, in[ 9] + K2,  3);
--	ROUND(G, d, a, b, c, in[11] + K2,  5);
--	ROUND(G, c, d, a, b, in[ 0] + K2,  9);
--	ROUND(G, b, c, d, a, in[ 2] + K2, 13);
--	ROUND(G, a, b, c, d, in[ 4] + K2,  3);
--	ROUND(G, d, a, b, c, in[ 6] + K2,  5);
--	ROUND(G, c, d, a, b, in[ 8] + K2,  9);
--	ROUND(G, b, c, d, a, in[10] + K2, 13);
--
--	/* Round 3 */
--	ROUND(H, a, b, c, d, in[ 3] + K3,  3);
--	ROUND(H, d, a, b, c, in[ 7] + K3,  9);
--	ROUND(H, c, d, a, b, in[11] + K3, 11);
--	ROUND(H, b, c, d, a, in[ 2] + K3, 15);
--	ROUND(H, a, b, c, d, in[ 6] + K3,  3);
--	ROUND(H, d, a, b, c, in[10] + K3,  9);
--	ROUND(H, c, d, a, b, in[ 1] + K3, 11);
--	ROUND(H, b, c, d, a, in[ 5] + K3, 15);
--	ROUND(H, a, b, c, d, in[ 9] + K3,  3);
--	ROUND(H, d, a, b, c, in[ 0] + K3,  9);
--	ROUND(H, c, d, a, b, in[ 4] + K3, 11);
--	ROUND(H, b, c, d, a, in[ 8] + K3, 15);
--
--	return buf[1] + b; /* "most hashed" word */
--	/* Alternative: return sum of all words? */
--}
--#endif
--
--#undef ROUND
--#undef F
--#undef G
--#undef H
--#undef K1
--#undef K2
--#undef K3
--
--/* This should not be decreased so low that ISNs wrap too fast. */
--#define REKEY_INTERVAL (300 * HZ)
--/*
-- * Bit layout of the tcp sequence numbers (before adding current time):
-- * bit 24-31: increased after every key exchange
-- * bit 0-23: hash(source,dest)
-- *
-- * The implementation is similar to the algorithm described
-- * in the Appendix of RFC 1185, except that
-- * - it uses a 1 MHz clock instead of a 250 kHz clock
-- * - it performs a rekey every 5 minutes, which is equivalent
-- * 	to a (source,dest) tulple dependent forward jump of the
-- * 	clock by 0..2^(HASH_BITS+1)
-- *
-- * Thus the average ISN wraparound time is 68 minutes instead of
-- * 4.55 hours.
-- *
-- * SMP cleanup and lock avoidance with poor man's RCU.
-- * 			Manfred Spraul <manfred@colorfullife.com>
-- *
-- */
--#define COUNT_BITS 8
--#define COUNT_MASK ((1 << COUNT_BITS) - 1)
--#define HASH_BITS 24
--#define HASH_MASK ((1 << HASH_BITS) - 1)
--
--static struct keydata {
--	__u32 count; /* already shifted to the final position */
--	__u32 secret[12];
--} ____cacheline_aligned ip_keydata[2];
--
--static unsigned int ip_cnt;
--
--static void rekey_seq_generator(struct work_struct *work);
--
--static DECLARE_DELAYED_WORK(rekey_work, rekey_seq_generator);
--
--/*
-- * Lock avoidance:
-- * The ISN generation runs lockless - it's just a hash over random data.
-- * State changes happen every 5 minutes when the random key is replaced.
-- * Synchronization is performed by having two copies of the hash function
-- * state and rekey_seq_generator always updates the inactive copy.
-- * The copy is then activated by updating ip_cnt.
-- * The implementation breaks down if someone blocks the thread
-- * that processes SYN requests for more than 5 minutes. Should never
-- * happen, and even if that happens only a not perfectly compliant
-- * ISN is generated, nothing fatal.
-- */
--static void rekey_seq_generator(struct work_struct *work)
--{
--	struct keydata *keyptr = &ip_keydata[1 ^ (ip_cnt & 1)];
--
--	get_random_bytes(keyptr->secret, sizeof(keyptr->secret));
--	keyptr->count = (ip_cnt & COUNT_MASK) << HASH_BITS;
--	smp_wmb();
--	ip_cnt++;
--	schedule_delayed_work(&rekey_work,
--			      round_jiffies_relative(REKEY_INTERVAL));
--}
--
--static inline struct keydata *get_keyptr(void)
--{
--	struct keydata *keyptr = &ip_keydata[ip_cnt & 1];
--
--	smp_rmb();
--
--	return keyptr;
--}
--
--static __init int seqgen_init(void)
--{
--	rekey_seq_generator(NULL);
-+	get_random_bytes(random_int_secret, sizeof(random_int_secret));
- 	return 0;
- }
--late_initcall(seqgen_init);
--
--#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
--__u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
--				   __be16 sport, __be16 dport)
--{
--	__u32 seq;
--	__u32 hash[12];
--	struct keydata *keyptr = get_keyptr();
--
--	/* The procedure is the same as for IPv4, but addresses are longer.
--	 * Thus we must use twothirdsMD4Transform.
--	 */
--
--	memcpy(hash, saddr, 16);
--	hash[4] = ((__force u16)sport << 16) + (__force u16)dport;
--	memcpy(&hash[5], keyptr->secret, sizeof(__u32) * 7);
--
--	seq = twothirdsMD4Transform((const __u32 *)daddr, hash) & HASH_MASK;
--	seq += keyptr->count;
--
--	seq += ktime_to_ns(ktime_get_real());
--
--	return seq;
--}
--EXPORT_SYMBOL(secure_tcpv6_sequence_number);
--#endif
--
--/*  The code below is shamelessly stolen from secure_tcp_sequence_number().
-- *  All blames to Andrey V. Savochkin <saw@msu.ru>.
-- */
--__u32 secure_ip_id(__be32 daddr)
--{
--	struct keydata *keyptr;
--	__u32 hash[4];
--
--	keyptr = get_keyptr();
--
--	/*
--	 *  Pick a unique starting offset for each IP destination.
--	 *  The dest ip address is placed in the starting vector,
--	 *  which is then hashed with random data.
--	 */
--	hash[0] = (__force __u32)daddr;
--	hash[1] = keyptr->secret[9];
--	hash[2] = keyptr->secret[10];
--	hash[3] = keyptr->secret[11];
--
--	return half_md4_transform(hash, keyptr->secret);
--}
--
--#ifdef CONFIG_INET
--
--__u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
--				 __be16 sport, __be16 dport)
--{
--	__u32 seq;
--	__u32 hash[4];
--	struct keydata *keyptr = get_keyptr();
--
--	/*
--	 *  Pick a unique starting offset for each TCP connection endpoints
--	 *  (saddr, daddr, sport, dport).
--	 *  Note that the words are placed into the starting vector, which is
--	 *  then mixed with a partial MD4 over random data.
--	 */
--	hash[0] = (__force u32)saddr;
--	hash[1] = (__force u32)daddr;
--	hash[2] = ((__force u16)sport << 16) + (__force u16)dport;
--	hash[3] = keyptr->secret[11];
--
--	seq = half_md4_transform(hash, keyptr->secret) & HASH_MASK;
--	seq += keyptr->count;
--	/*
--	 *	As close as possible to RFC 793, which
--	 *	suggests using a 250 kHz clock.
--	 *	Further reading shows this assumes 2 Mb/s networks.
--	 *	For 10 Mb/s Ethernet, a 1 MHz clock is appropriate.
--	 *	For 10 Gb/s Ethernet, a 1 GHz clock should be ok, but
--	 *	we also need to limit the resolution so that the u32 seq
--	 *	overlaps less than one time per MSL (2 minutes).
--	 *	Choosing a clock of 64 ns period is OK. (period of 274 s)
--	 */
--	seq += ktime_to_ns(ktime_get_real()) >> 6;
--
--	return seq;
--}
--
--/* Generate secure starting point for ephemeral IPV4 transport port search */
--u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)
--{
--	struct keydata *keyptr = get_keyptr();
--	u32 hash[4];
--
--	/*
--	 *  Pick a unique starting offset for each ephemeral port search
--	 *  (saddr, daddr, dport) and 48bits of random data.
--	 */
--	hash[0] = (__force u32)saddr;
--	hash[1] = (__force u32)daddr;
--	hash[2] = (__force u32)dport ^ keyptr->secret[10];
--	hash[3] = keyptr->secret[11];
--
--	return half_md4_transform(hash, keyptr->secret);
--}
--EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral);
--
--#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
--u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
--			       __be16 dport)
--{
--	struct keydata *keyptr = get_keyptr();
--	u32 hash[12];
--
--	memcpy(hash, saddr, 16);
--	hash[4] = (__force u32)dport;
--	memcpy(&hash[5], keyptr->secret, sizeof(__u32) * 7);
--
--	return twothirdsMD4Transform((const __u32 *)daddr, hash);
--}
--#endif
--
--#if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
--/* Similar to secure_tcp_sequence_number but generate a 48 bit value
-- * bit's 32-47 increase every key exchange
-- *       0-31  hash(source, dest)
-- */
--u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
--				__be16 sport, __be16 dport)
--{
--	u64 seq;
--	__u32 hash[4];
--	struct keydata *keyptr = get_keyptr();
--
--	hash[0] = (__force u32)saddr;
--	hash[1] = (__force u32)daddr;
--	hash[2] = ((__force u16)sport << 16) + (__force u16)dport;
--	hash[3] = keyptr->secret[11];
--
--	seq = half_md4_transform(hash, keyptr->secret);
--	seq |= ((u64)keyptr->count) << (32 - HASH_BITS);
--
--	seq += ktime_to_ns(ktime_get_real());
--	seq &= (1ull << 48) - 1;
--
--	return seq;
--}
--EXPORT_SYMBOL(secure_dccp_sequence_number);
--#endif
--
--#endif /* CONFIG_INET */
--
-+late_initcall(random_int_secret_init);
- 
- /*
-  * Get a random word for internal kernel use only. Similar to urandom but
-@@ -1670,17 +1354,15 @@ EXPORT_SYMBOL(secure_dccp_sequence_number);
-  * value is not cryptographically secure but for several uses the cost of
-  * depleting entropy is too high
-  */
--DEFINE_PER_CPU(__u32 [4], get_random_int_hash);
-+DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash);
- unsigned int get_random_int(void)
- {
--	struct keydata *keyptr;
- 	__u32 *hash = get_cpu_var(get_random_int_hash);
--	int ret;
-+	unsigned int ret;
- 
--	keyptr = get_keyptr();
- 	hash[0] += current->pid + jiffies + get_cycles();
--
--	ret = half_md4_transform(hash, keyptr->secret);
-+	md5_transform(hash, random_int_secret);
-+	ret = hash[0];
- 	put_cpu_var(get_random_int_hash);
- 
- 	return ret;
-diff --git a/include/linux/cryptohash.h b/include/linux/cryptohash.h
-index c118b2ad..1ba279b 100644
---- a/include/linux/cryptohash.h
-+++ b/include/linux/cryptohash.h
-@@ -7,6 +7,11 @@
- void sha_init(__u32 *buf);
- void sha_transform(__u32 *digest, const char *data, __u32 *W);
- 
-+#define MD5_DIGEST_WORDS 4
-+#define MD5_MESSAGE_BYTES 64
-+
-+void md5_transform(__u32 *hash, __u32 const *in);
-+
- __u32 half_md4_transform(__u32 buf[4], __u32 const in[8]);
- 
- #endif
-diff --git a/include/linux/random.h b/include/linux/random.h
-index 25d02fe..2948046 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -53,17 +53,6 @@ extern void add_interrupt_randomness(int irq);
- extern void get_random_bytes(void *buf, int nbytes);
- void generate_random_uuid(unsigned char uuid_out[16]);
- 
--extern __u32 secure_ip_id(__be32 daddr);
--extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
--extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
--				      __be16 dport);
--extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
--					__be16 sport, __be16 dport);
--extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
--					  __be16 sport, __be16 dport);
--extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
--				       __be16 sport, __be16 dport);
--
- #ifndef MODULE
- extern const struct file_operations random_fops, urandom_fops;
- #endif
-diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h
-new file mode 100644
-index 0000000..d97f689
---- /dev/null
-+++ b/include/net/secure_seq.h
-@@ -0,0 +1,20 @@
-+#ifndef _NET_SECURE_SEQ
-+#define _NET_SECURE_SEQ
-+
-+#include <linux/types.h>
-+
-+extern __u32 secure_ip_id(__be32 daddr);
-+extern __u32 secure_ipv6_id(const __be32 daddr[4]);
-+extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
-+extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
-+				      __be16 dport);
-+extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
-+					__be16 sport, __be16 dport);
-+extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
-+					  __be16 sport, __be16 dport);
-+extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
-+				       __be16 sport, __be16 dport);
-+extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
-+					 __be16 sport, __be16 dport);
-+
-+#endif /* _NET_SECURE_SEQ */
-diff --git a/lib/Makefile b/lib/Makefile
-index 452f188..5ecf2ba 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -10,7 +10,7 @@ endif
- lib-y := ctype.o string.o vsprintf.o cmdline.o \
- 	 rbtree.o radix-tree.o dump_stack.o \
- 	 idr.o int_sqrt.o extable.o prio_tree.o \
--	 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
-+	 sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \
- 	 proportions.o prio_heap.o ratelimit.o show_mem.o \
- 	 is_single_threaded.o plist.o decompress.o flex_array.o
- 
-diff --git a/lib/md5.c b/lib/md5.c
-new file mode 100644
-index 0000000..c777180
---- /dev/null
-+++ b/lib/md5.c
-@@ -0,0 +1,95 @@
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/cryptohash.h>
-+
-+#define F1(x, y, z)	(z ^ (x & (y ^ z)))
-+#define F2(x, y, z)	F1(z, x, y)
-+#define F3(x, y, z)	(x ^ y ^ z)
-+#define F4(x, y, z)	(y ^ (x | ~z))
-+
-+#define MD5STEP(f, w, x, y, z, in, s) \
-+	(w += f(x, y, z) + in, w = (w<<s | w>>(32-s)) + x)
-+
-+void md5_transform(__u32 *hash, __u32 const *in)
-+{
-+	u32 a, b, c, d;
-+
-+	a = hash[0];
-+	b = hash[1];
-+	c = hash[2];
-+	d = hash[3];
-+
-+	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-+	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-+	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-+	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-+	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-+	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-+	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-+	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-+	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-+	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-+	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-+	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-+	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-+	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-+	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-+	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-+
-+	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-+	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-+	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-+	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-+	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-+	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-+	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-+	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-+	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-+	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-+	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-+	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-+	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-+	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-+	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-+	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-+
-+	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-+	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-+	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-+	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-+	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-+	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-+	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-+	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-+	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-+	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-+	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-+	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-+	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-+	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-+	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-+	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-+
-+	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-+	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-+	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-+	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-+	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-+	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-+	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-+	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-+	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-+	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-+	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-+	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-+	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-+	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-+	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-+	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-+
-+	hash[0] += a;
-+	hash[1] += b;
-+	hash[2] += c;
-+	hash[3] += d;
-+}
-+EXPORT_SYMBOL(md5_transform);
-diff --git a/net/core/Makefile b/net/core/Makefile
-index 796f46e..ace37e4 100644
---- a/net/core/Makefile
-+++ b/net/core/Makefile
-@@ -3,7 +3,7 @@
- #
- 
- obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \
--	 gen_stats.o gen_estimator.o net_namespace.o
-+	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o
- 
- obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
- obj-$(CONFIG_HAS_DMA) += skb_dma_map.o
-diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
-new file mode 100644
-index 0000000..45329d7
---- /dev/null
-+++ b/net/core/secure_seq.c
-@@ -0,0 +1,184 @@
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/cryptohash.h>
-+#include <linux/module.h>
-+#include <linux/cache.h>
-+#include <linux/random.h>
-+#include <linux/hrtimer.h>
-+#include <linux/ktime.h>
-+#include <linux/string.h>
-+
-+#include <net/secure_seq.h>
-+
-+static u32 net_secret[MD5_MESSAGE_BYTES / 4] ____cacheline_aligned;
-+
-+static int __init net_secret_init(void)
-+{
-+	get_random_bytes(net_secret, sizeof(net_secret));
-+	return 0;
-+}
-+late_initcall(net_secret_init);
-+
-+static u32 seq_scale(u32 seq)
-+{
-+	/*
-+	 *	As close as possible to RFC 793, which
-+	 *	suggests using a 250 kHz clock.
-+	 *	Further reading shows this assumes 2 Mb/s networks.
-+	 *	For 10 Mb/s Ethernet, a 1 MHz clock is appropriate.
-+	 *	For 10 Gb/s Ethernet, a 1 GHz clock should be ok, but
-+	 *	we also need to limit the resolution so that the u32 seq
-+	 *	overlaps less than one time per MSL (2 minutes).
-+	 *	Choosing a clock of 64 ns period is OK. (period of 274 s)
-+	 */
-+	return seq + (ktime_to_ns(ktime_get_real()) >> 6);
-+}
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+__u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
-+				   __be16 sport, __be16 dport)
-+{
-+	u32 secret[MD5_MESSAGE_BYTES / 4];
-+	u32 hash[MD5_DIGEST_WORDS];
-+	u32 i;
-+
-+	memcpy(hash, saddr, 16);
-+	for (i = 0; i < 4; i++)
-+		secret[i] = net_secret[i] + daddr[i];
-+	secret[4] = net_secret[4] +
-+		(((__force u16)sport << 16) + (__force u16)dport);
-+	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
-+		secret[i] = net_secret[i];
-+
-+	md5_transform(hash, secret);
-+
-+	return seq_scale(hash[0]);
-+}
-+EXPORT_SYMBOL(secure_tcpv6_sequence_number);
-+
-+u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
-+			       __be16 dport)
-+{
-+	u32 secret[MD5_MESSAGE_BYTES / 4];
-+	u32 hash[MD5_DIGEST_WORDS];
-+	u32 i;
-+
-+	memcpy(hash, saddr, 16);
-+	for (i = 0; i < 4; i++)
-+		secret[i] = net_secret[i] + (__force u32) daddr[i];
-+	secret[4] = net_secret[4] + (__force u32)dport;
-+	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
-+		secret[i] = net_secret[i];
-+
-+	md5_transform(hash, secret);
-+
-+	return hash[0];
-+}
-+#endif
-+
-+#ifdef CONFIG_INET
-+__u32 secure_ip_id(__be32 daddr)
-+{
-+	u32 hash[MD5_DIGEST_WORDS];
-+
-+	hash[0] = (__force __u32) daddr;
-+	hash[1] = net_secret[13];
-+	hash[2] = net_secret[14];
-+	hash[3] = net_secret[15];
-+
-+	md5_transform(hash, net_secret);
-+
-+	return hash[0];
-+}
-+
-+__u32 secure_ipv6_id(const __be32 daddr[4])
-+{
-+	__u32 hash[4];
-+
-+	memcpy(hash, daddr, 16);
-+	md5_transform(hash, net_secret);
-+
-+	return hash[0];
-+}
-+
-+__u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
-+				 __be16 sport, __be16 dport)
-+{
-+	u32 hash[MD5_DIGEST_WORDS];
-+
-+	hash[0] = (__force u32)saddr;
-+	hash[1] = (__force u32)daddr;
-+	hash[2] = ((__force u16)sport << 16) + (__force u16)dport;
-+	hash[3] = net_secret[15];
-+
-+	md5_transform(hash, net_secret);
-+
-+	return seq_scale(hash[0]);
-+}
-+
-+u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport)
-+{
-+	u32 hash[MD5_DIGEST_WORDS];
-+
-+	hash[0] = (__force u32)saddr;
-+	hash[1] = (__force u32)daddr;
-+	hash[2] = (__force u32)dport ^ net_secret[14];
-+	hash[3] = net_secret[15];
-+
-+	md5_transform(hash, net_secret);
-+
-+	return hash[0];
-+}
-+EXPORT_SYMBOL_GPL(secure_ipv4_port_ephemeral);
-+#endif
-+
-+#if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
-+u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
-+				__be16 sport, __be16 dport)
-+{
-+	u32 hash[MD5_DIGEST_WORDS];
-+	u64 seq;
-+
-+	hash[0] = (__force u32)saddr;
-+	hash[1] = (__force u32)daddr;
-+	hash[2] = ((__force u16)sport << 16) + (__force u16)dport;
-+	hash[3] = net_secret[15];
-+
-+	md5_transform(hash, net_secret);
-+
-+	seq = hash[0] | (((u64)hash[1]) << 32);
-+	seq += ktime_to_ns(ktime_get_real());
-+	seq &= (1ull << 48) - 1;
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL(secure_dccp_sequence_number);
-+
-+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-+u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
-+				  __be16 sport, __be16 dport)
-+{
-+	u32 secret[MD5_MESSAGE_BYTES / 4];
-+	u32 hash[MD5_DIGEST_WORDS];
-+	u64 seq;
-+	u32 i;
-+
-+	memcpy(hash, saddr, 16);
-+	for (i = 0; i < 4; i++)
-+		secret[i] = net_secret[i] + daddr[i];
-+	secret[4] = net_secret[4] +
-+		(((__force u16)sport << 16) + (__force u16)dport);
-+	for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)
-+		secret[i] = net_secret[i];
-+
-+	md5_transform(hash, secret);
-+
-+	seq = hash[0] | (((u64)hash[1]) << 32);
-+	seq += ktime_to_ns(ktime_get_real());
-+	seq &= (1ull << 48) - 1;
-+
-+	return seq;
-+}
-+EXPORT_SYMBOL(secure_dccpv6_sequence_number);
-+#endif
-+#endif
-diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
-index 7302e14..d14c0a3 100644
---- a/net/dccp/ipv4.c
-+++ b/net/dccp/ipv4.c
-@@ -25,6 +25,7 @@
- #include <net/timewait_sock.h>
- #include <net/tcp_states.h>
- #include <net/xfrm.h>
-+#include <net/secure_seq.h>
- 
- #include "ackvec.h"
- #include "ccid.h"
-diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
-index e48ca5d..9ed1962 100644
---- a/net/dccp/ipv6.c
-+++ b/net/dccp/ipv6.c
-@@ -28,6 +28,7 @@
- #include <net/transp_v6.h>
- #include <net/ip6_checksum.h>
- #include <net/xfrm.h>
-+#include <net/secure_seq.h>
- 
- #include "dccp.h"
- #include "ipv6.h"
-@@ -69,13 +70,7 @@ static inline void dccp_v6_send_check(struct sock *sk, int unused_value,
- 	dh->dccph_checksum = dccp_v6_csum_finish(skb, &np->saddr, &np->daddr);
- }
- 
--static inline __u32 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
--						  __be16 sport, __be16 dport   )
--{
--	return secure_tcpv6_sequence_number(saddr, daddr, sport, dport);
--}
--
--static inline __u32 dccp_v6_init_sequence(struct sk_buff *skb)
-+static inline __u64 dccp_v6_init_sequence(struct sk_buff *skb)
- {
- 	return secure_dccpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32,
- 					     ipv6_hdr(skb)->saddr.s6_addr32,
-diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
-index 625cc5f..d717267 100644
---- a/net/ipv4/inet_hashtables.c
-+++ b/net/ipv4/inet_hashtables.c
-@@ -21,6 +21,7 @@
- 
- #include <net/inet_connection_sock.h>
- #include <net/inet_hashtables.h>
-+#include <net/secure_seq.h>
- #include <net/ip.h>
- 
- /*
-diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
-index b1fbe18..13b229f 100644
---- a/net/ipv4/inetpeer.c
-+++ b/net/ipv4/inetpeer.c
-@@ -19,6 +19,7 @@
- #include <linux/net.h>
- #include <net/ip.h>
- #include <net/inetpeer.h>
-+#include <net/secure_seq.h>
- 
- /*
-  *  Theory of operations.
-diff --git a/net/ipv4/netfilter/nf_nat_proto_common.c b/net/ipv4/netfilter/nf_nat_proto_common.c
-index 6c4f11f..2d5073a 100644
---- a/net/ipv4/netfilter/nf_nat_proto_common.c
-+++ b/net/ipv4/netfilter/nf_nat_proto_common.c
-@@ -12,6 +12,7 @@
- #include <linux/ip.h>
- 
- #include <linux/netfilter.h>
-+#include <net/secure_seq.h>
- #include <net/netfilter/nf_nat.h>
- #include <net/netfilter/nf_nat_core.h>
- #include <net/netfilter/nf_nat_rule.h>
-diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 6c8f6c9..58f141b 100644
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -107,6 +107,7 @@
- #ifdef CONFIG_SYSCTL
- #include <linux/sysctl.h>
- #endif
-+#include <net/secure_seq.h>
- 
- #define RT_FL_TOS(oldflp) \
-     ((u32)(oldflp->fl4_tos & (IPTOS_RT_MASK | RTO_ONLINK)))
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index 7cda24b..6fc7961 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -71,6 +71,7 @@
- #include <net/timewait_sock.h>
- #include <net/xfrm.h>
- #include <net/netdma.h>
-+#include <net/secure_seq.h>
- 
- #include <linux/inet.h>
- #include <linux/ipv6.h>
-diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
-index 1bcc343..093e9b2 100644
---- a/net/ipv6/inet6_hashtables.c
-+++ b/net/ipv6/inet6_hashtables.c
-@@ -20,6 +20,7 @@
- #include <net/inet_connection_sock.h>
- #include <net/inet_hashtables.h>
- #include <net/inet6_hashtables.h>
-+#include <net/secure_seq.h>
- #include <net/ip.h>
- 
- void __inet6_hash(struct sock *sk)
-diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 21d100b..faae6df 100644
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -60,6 +60,7 @@
- #include <net/timewait_sock.h>
- #include <net/netdma.h>
- #include <net/inet_common.h>
-+#include <net/secure_seq.h>
- 
- #include <asm/uaccess.h>
- 
-diff --git a/sound/core/timer.c b/sound/core/timer.c
-index 8f8b17a..4a13844 100644
---- a/sound/core/timer.c
-+++ b/sound/core/timer.c
-@@ -530,6 +530,8 @@ int snd_timer_stop(struct snd_timer_instance *timeri)
- 	if (err < 0)
- 		return err;
- 	timer = timeri->timer;
-+	if (!timer)
-+		return -EINVAL;
- 	spin_lock_irqsave(&timer->lock, flags);
- 	timeri->cticks = timeri->ticks;
- 	timeri->pticks = 0;
-diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
-index a48d309..c93e1aa 100644
---- a/sound/usb/caiaq/input.c
-+++ b/sound/usb/caiaq/input.c
-@@ -28,7 +28,7 @@ static unsigned short keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
- static unsigned short keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
- 					 KEY_5, KEY_6, KEY_7 };
- static unsigned short keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
--					 KEY_5, KEY_6, KEY_7, KEY_5, KEY_6 };
-+					 KEY_5, KEY_6, KEY_7, KEY_8, KEY_9 };
- 
- static unsigned short keycode_kore[] = {
- 	KEY_FN_F1,      /* "menu"               */
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch
index 1c7de41..abe67d0 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.45-201108281458.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201108301903.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.32.45/arch/alpha/include/asm/elf.h linux-2.6.32.45/arch/alpha/include/asm/elf.h
---- linux-2.6.32.45/arch/alpha/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/alpha/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/alpha/include/asm/elf.h linux-2.6.32.46/arch/alpha/include/asm/elf.h
+--- linux-2.6.32.46/arch/alpha/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/alpha/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-2.6.32.45/arch/alpha/include/asm/elf.h linux-2.6.32.45/arch/alp
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.32.45/arch/alpha/include/asm/pgtable.h linux-2.6.32.45/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.45/arch/alpha/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/alpha/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/alpha/include/asm/pgtable.h linux-2.6.32.46/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.32.46/arch/alpha/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/alpha/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-2.6.32.45/arch/alpha/include/asm/pgtable.h linux-2.6.32.45/arch
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.32.45/arch/alpha/kernel/module.c linux-2.6.32.45/arch/alpha/kernel/module.c
---- linux-2.6.32.45/arch/alpha/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/alpha/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/alpha/kernel/module.c linux-2.6.32.46/arch/alpha/kernel/module.c
+--- linux-2.6.32.46/arch/alpha/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/alpha/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-2.6.32.45/arch/alpha/kernel/module.c linux-2.6.32.45/arch/alpha
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.32.45/arch/alpha/kernel/osf_sys.c linux-2.6.32.45/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.45/arch/alpha/kernel/osf_sys.c	2011-08-09 18:35:28.000000000 -0400
-+++ linux-2.6.32.45/arch/alpha/kernel/osf_sys.c	2011-06-13 17:19:47.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/alpha/kernel/osf_sys.c linux-2.6.32.46/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.32.46/arch/alpha/kernel/osf_sys.c	2011-08-09 18:35:28.000000000 -0400
++++ linux-2.6.32.46/arch/alpha/kernel/osf_sys.c	2011-06-13 17:19:47.000000000 -0400
 @@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
@@ -82,9 +82,9 @@ diff -urNp linux-2.6.32.45/arch/alpha/kernel/osf_sys.c linux-2.6.32.45/arch/alph
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-2.6.32.45/arch/alpha/mm/fault.c linux-2.6.32.45/arch/alpha/mm/fault.c
---- linux-2.6.32.45/arch/alpha/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/alpha/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/alpha/mm/fault.c linux-2.6.32.46/arch/alpha/mm/fault.c
+--- linux-2.6.32.46/arch/alpha/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/alpha/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -241,9 +241,9 @@ diff -urNp linux-2.6.32.45/arch/alpha/mm/fault.c linux-2.6.32.45/arch/alpha/mm/f
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.32.45/arch/arm/include/asm/elf.h linux-2.6.32.45/arch/arm/include/asm/elf.h
---- linux-2.6.32.45/arch/arm/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/include/asm/elf.h linux-2.6.32.46/arch/arm/include/asm/elf.h
+--- linux-2.6.32.46/arch/arm/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -260,9 +260,9 @@ diff -urNp linux-2.6.32.45/arch/arm/include/asm/elf.h linux-2.6.32.45/arch/arm/i
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-diff -urNp linux-2.6.32.45/arch/arm/include/asm/kmap_types.h linux-2.6.32.45/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.45/arch/arm/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/include/asm/kmap_types.h linux-2.6.32.46/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.32.46/arch/arm/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -19,6 +19,7 @@ enum km_type {
  	KM_SOFTIRQ0,
  	KM_SOFTIRQ1,
@@ -271,9 +271,9 @@ diff -urNp linux-2.6.32.45/arch/arm/include/asm/kmap_types.h linux-2.6.32.45/arc
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.45/arch/arm/include/asm/uaccess.h linux-2.6.32.45/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.45/arch/arm/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/include/asm/uaccess.h	2011-06-29 21:02:24.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/include/asm/uaccess.h linux-2.6.32.46/arch/arm/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/arm/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/include/asm/uaccess.h	2011-06-29 21:02:24.000000000 -0400
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -329,9 +329,9 @@ diff -urNp linux-2.6.32.45/arch/arm/include/asm/uaccess.h linux-2.6.32.45/arch/a
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-2.6.32.45/arch/arm/kernel/armksyms.c linux-2.6.32.45/arch/arm/kernel/armksyms.c
---- linux-2.6.32.45/arch/arm/kernel/armksyms.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/kernel/armksyms.c	2011-07-06 19:51:50.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/kernel/armksyms.c linux-2.6.32.46/arch/arm/kernel/armksyms.c
+--- linux-2.6.32.46/arch/arm/kernel/armksyms.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/kernel/armksyms.c	2011-07-06 19:51:50.000000000 -0400
 @@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -343,9 +343,9 @@ diff -urNp linux-2.6.32.45/arch/arm/kernel/armksyms.c linux-2.6.32.45/arch/arm/k
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-2.6.32.45/arch/arm/kernel/kgdb.c linux-2.6.32.45/arch/arm/kernel/kgdb.c
---- linux-2.6.32.45/arch/arm/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/kernel/kgdb.c linux-2.6.32.46/arch/arm/kernel/kgdb.c
+--- linux-2.6.32.46/arch/arm/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
   * and we handle the normal undef case within the do_undefinstr
   * handler.
@@ -355,9 +355,9 @@ diff -urNp linux-2.6.32.45/arch/arm/kernel/kgdb.c linux-2.6.32.45/arch/arm/kerne
  #ifndef __ARMEB__
  	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
  #else /* ! __ARMEB__ */
-diff -urNp linux-2.6.32.45/arch/arm/kernel/traps.c linux-2.6.32.45/arch/arm/kernel/traps.c
---- linux-2.6.32.45/arch/arm/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/kernel/traps.c	2011-06-13 21:31:18.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/kernel/traps.c linux-2.6.32.46/arch/arm/kernel/traps.c
+--- linux-2.6.32.46/arch/arm/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/kernel/traps.c	2011-06-13 21:31:18.000000000 -0400
 @@ -247,6 +247,8 @@ static void __die(const char *str, int e
  
  DEFINE_SPINLOCK(die_lock);
@@ -376,9 +376,9 @@ diff -urNp linux-2.6.32.45/arch/arm/kernel/traps.c linux-2.6.32.45/arch/arm/kern
  	do_exit(SIGSEGV);
  }
  
-diff -urNp linux-2.6.32.45/arch/arm/lib/copy_from_user.S linux-2.6.32.45/arch/arm/lib/copy_from_user.S
---- linux-2.6.32.45/arch/arm/lib/copy_from_user.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/lib/copy_from_user.S	2011-06-29 20:48:38.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/lib/copy_from_user.S linux-2.6.32.46/arch/arm/lib/copy_from_user.S
+--- linux-2.6.32.46/arch/arm/lib/copy_from_user.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/lib/copy_from_user.S	2011-06-29 20:48:38.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -402,9 +402,9 @@ diff -urNp linux-2.6.32.45/arch/arm/lib/copy_from_user.S linux-2.6.32.45/arch/ar
  
  	.section .fixup,"ax"
  	.align 0
-diff -urNp linux-2.6.32.45/arch/arm/lib/copy_to_user.S linux-2.6.32.45/arch/arm/lib/copy_to_user.S
---- linux-2.6.32.45/arch/arm/lib/copy_to_user.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/lib/copy_to_user.S	2011-06-29 20:46:49.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/lib/copy_to_user.S linux-2.6.32.46/arch/arm/lib/copy_to_user.S
+--- linux-2.6.32.46/arch/arm/lib/copy_to_user.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/lib/copy_to_user.S	2011-06-29 20:46:49.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -428,9 +428,9 @@ diff -urNp linux-2.6.32.45/arch/arm/lib/copy_to_user.S linux-2.6.32.45/arch/arm/
  
  	.section .fixup,"ax"
  	.align 0
-diff -urNp linux-2.6.32.45/arch/arm/lib/uaccess.S linux-2.6.32.45/arch/arm/lib/uaccess.S
---- linux-2.6.32.45/arch/arm/lib/uaccess.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/lib/uaccess.S	2011-06-29 20:48:53.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess.S linux-2.6.32.46/arch/arm/lib/uaccess.S
+--- linux-2.6.32.46/arch/arm/lib/uaccess.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/lib/uaccess.S	2011-06-29 20:48:53.000000000 -0400
 @@ -19,7 +19,7 @@
  
  #define PAGE_SHIFT 12
@@ -484,9 +484,9 @@ diff -urNp linux-2.6.32.45/arch/arm/lib/uaccess.S linux-2.6.32.45/arch/arm/lib/u
  
  		.section .fixup,"ax"
  		.align	0
-diff -urNp linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c
---- linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c	2011-06-29 20:44:35.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/lib/uaccess_with_memcpy.c	2011-06-29 20:44:35.000000000 -0400
 @@ -97,7 +97,7 @@ out:
  }
  
@@ -496,9 +496,9 @@ diff -urNp linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.32.45/ar
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-2.6.32.45/arch/arm/mach-at91/pm.c linux-2.6.32.45/arch/arm/mach-at91/pm.c
---- linux-2.6.32.45/arch/arm/mach-at91/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-at91/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-at91/pm.c linux-2.6.32.46/arch/arm/mach-at91/pm.c
+--- linux-2.6.32.46/arch/arm/mach-at91/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-at91/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -348,7 +348,7 @@ static void at91_pm_end(void)
  }
  
@@ -508,9 +508,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-at91/pm.c linux-2.6.32.45/arch/arm/mach
  	.valid	= at91_pm_valid_state,
  	.begin	= at91_pm_begin,
  	.enter	= at91_pm_enter,
-diff -urNp linux-2.6.32.45/arch/arm/mach-omap1/pm.c linux-2.6.32.45/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.45/arch/arm/mach-omap1/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-omap1/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-omap1/pm.c linux-2.6.32.46/arch/arm/mach-omap1/pm.c
+--- linux-2.6.32.46/arch/arm/mach-omap1/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-omap1/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 
  
  
@@ -520,9 +520,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-omap1/pm.c linux-2.6.32.45/arch/arm/mac
  	.prepare	= omap_pm_prepare,
  	.enter		= omap_pm_enter,
  	.finish		= omap_pm_finish,
-diff -urNp linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-omap2/pm24xx.c	2011-04-17 15:56:45.000000000 -0400
 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
  	enable_hlt();
  }
@@ -532,9 +532,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.45/arch/arm
  	.prepare	= omap2_pm_prepare,
  	.enter		= omap2_pm_enter,
  	.finish		= omap2_pm_finish,
-diff -urNp linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-omap2/pm34xx.c	2011-04-17 15:56:45.000000000 -0400
 @@ -401,7 +401,7 @@ static void omap3_pm_end(void)
  	return;
  }
@@ -544,9 +544,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.45/arch/arm
  	.begin		= omap3_pm_begin,
  	.end		= omap3_pm_end,
  	.prepare	= omap3_pm_prepare,
-diff -urNp linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-pnx4008/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
  	       (state == PM_SUSPEND_MEM);
  }
@@ -556,9 +556,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c linux-2.6.32.45/arch/arm/m
  	.enter = pnx4008_pm_enter,
  	.valid = pnx4008_pm_valid,
  };
-diff -urNp linux-2.6.32.45/arch/arm/mach-pxa/pm.c linux-2.6.32.45/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.45/arch/arm/mach-pxa/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-pxa/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/pm.c linux-2.6.32.46/arch/arm/mach-pxa/pm.c
+--- linux-2.6.32.46/arch/arm/mach-pxa/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-pxa/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -95,7 +95,7 @@ void pxa_pm_finish(void)
  		pxa_cpu_pm_fns->finish();
  }
@@ -568,9 +568,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-pxa/pm.c linux-2.6.32.45/arch/arm/mach-
  	.valid		= pxa_pm_valid,
  	.enter		= pxa_pm_enter,
  	.prepare	= pxa_pm_prepare,
-diff -urNp linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-pxa/sharpsl_pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
  }
  
@@ -580,9 +580,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.45/arch/a
  	.prepare	= pxa_pm_prepare,
  	.finish		= pxa_pm_finish,
  	.enter		= corgi_pxa_pm_enter,
-diff -urNp linux-2.6.32.45/arch/arm/mach-sa1100/pm.c linux-2.6.32.45/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.45/arch/arm/mach-sa1100/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mach-sa1100/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mach-sa1100/pm.c linux-2.6.32.46/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.32.46/arch/arm/mach-sa1100/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mach-sa1100/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
  	return virt_to_phys(sp);
  }
@@ -592,9 +592,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mach-sa1100/pm.c linux-2.6.32.45/arch/arm/ma
  	.enter		= sa11x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.45/arch/arm/mm/fault.c linux-2.6.32.45/arch/arm/mm/fault.c
---- linux-2.6.32.45/arch/arm/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mm/fault.c linux-2.6.32.46/arch/arm/mm/fault.c
+--- linux-2.6.32.46/arch/arm/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -643,9 +643,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mm/fault.c linux-2.6.32.45/arch/arm/mm/fault
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-2.6.32.45/arch/arm/mm/mmap.c linux-2.6.32.45/arch/arm/mm/mmap.c
---- linux-2.6.32.45/arch/arm/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/mm/mmap.c linux-2.6.32.46/arch/arm/mm/mmap.c
+--- linux-2.6.32.46/arch/arm/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -695,9 +695,9 @@ diff -urNp linux-2.6.32.45/arch/arm/mm/mmap.c linux-2.6.32.45/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-2.6.32.45/arch/arm/plat-s3c/pm.c linux-2.6.32.45/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.45/arch/arm/plat-s3c/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/arm/plat-s3c/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/arm/plat-s3c/pm.c linux-2.6.32.46/arch/arm/plat-s3c/pm.c
+--- linux-2.6.32.46/arch/arm/plat-s3c/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/arm/plat-s3c/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
  	s3c_pm_check_cleanup();
  }
@@ -707,9 +707,9 @@ diff -urNp linux-2.6.32.45/arch/arm/plat-s3c/pm.c linux-2.6.32.45/arch/arm/plat-
  	.enter		= s3c_pm_enter,
  	.prepare	= s3c_pm_prepare,
  	.finish		= s3c_pm_finish,
-diff -urNp linux-2.6.32.45/arch/avr32/include/asm/elf.h linux-2.6.32.45/arch/avr32/include/asm/elf.h
---- linux-2.6.32.45/arch/avr32/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/avr32/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/avr32/include/asm/elf.h linux-2.6.32.46/arch/avr32/include/asm/elf.h
+--- linux-2.6.32.46/arch/avr32/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/avr32/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -726,9 +726,9 @@ diff -urNp linux-2.6.32.45/arch/avr32/include/asm/elf.h linux-2.6.32.45/arch/avr
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/avr32/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -739,9 +739,9 @@ diff -urNp linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h linux-2.6.32.45/a
  };
  
  #undef D
-diff -urNp linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/avr32/mach-at32ap/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -176,7 +176,7 @@ out:
  	return 0;
  }
@@ -751,9 +751,9 @@ diff -urNp linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c linux-2.6.32.45/arch/avr3
  	.valid	= avr32_pm_valid_state,
  	.enter	= avr32_pm_enter,
  };
-diff -urNp linux-2.6.32.45/arch/avr32/mm/fault.c linux-2.6.32.45/arch/avr32/mm/fault.c
---- linux-2.6.32.45/arch/avr32/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/avr32/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/avr32/mm/fault.c linux-2.6.32.46/arch/avr32/mm/fault.c
+--- linux-2.6.32.46/arch/avr32/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/avr32/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -795,9 +795,9 @@ diff -urNp linux-2.6.32.45/arch/avr32/mm/fault.c linux-2.6.32.45/arch/avr32/mm/f
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.32.45/arch/blackfin/kernel/kgdb.c linux-2.6.32.45/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.45/arch/blackfin/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/blackfin/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/blackfin/kernel/kgdb.c linux-2.6.32.46/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.32.46/arch/blackfin/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/blackfin/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;		/* this means that we do not want to exit from the handler */
  }
@@ -807,9 +807,9 @@ diff -urNp linux-2.6.32.45/arch/blackfin/kernel/kgdb.c linux-2.6.32.45/arch/blac
  	.gdb_bpt_instr = {0xa1},
  #ifdef CONFIG_SMP
  	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.32.45/arch/blackfin/mach-common/pm.c linux-2.6.32.45/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.45/arch/blackfin/mach-common/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/blackfin/mach-common/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/blackfin/mach-common/pm.c linux-2.6.32.46/arch/blackfin/mach-common/pm.c
+--- linux-2.6.32.46/arch/blackfin/mach-common/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/blackfin/mach-common/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
  	return 0;
  }
@@ -819,9 +819,9 @@ diff -urNp linux-2.6.32.45/arch/blackfin/mach-common/pm.c linux-2.6.32.45/arch/b
  	.enter = bfin_pm_enter,
  	.valid	= bfin_pm_valid,
  };
-diff -urNp linux-2.6.32.45/arch/frv/include/asm/kmap_types.h linux-2.6.32.45/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.45/arch/frv/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/frv/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/frv/include/asm/kmap_types.h linux-2.6.32.46/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.32.46/arch/frv/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/frv/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -830,9 +830,9 @@ diff -urNp linux-2.6.32.45/arch/frv/include/asm/kmap_types.h linux-2.6.32.45/arc
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.45/arch/frv/mm/elf-fdpic.c linux-2.6.32.45/arch/frv/mm/elf-fdpic.c
---- linux-2.6.32.45/arch/frv/mm/elf-fdpic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/frv/mm/elf-fdpic.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/frv/mm/elf-fdpic.c linux-2.6.32.46/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.32.46/arch/frv/mm/elf-fdpic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/frv/mm/elf-fdpic.c	2011-04-17 15:56:45.000000000 -0400
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -861,9 +861,9 @@ diff -urNp linux-2.6.32.45/arch/frv/mm/elf-fdpic.c linux-2.6.32.45/arch/frv/mm/e
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/hp/common/hwsw_iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/swiotlb.h>
  #include <asm/machvec.h>
@@ -882,9 +882,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.45/arch
  {
  	if (use_swiotlb(dev))
  		return &swiotlb_dma_ops;
-diff -urNp linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/hp/common/sba_iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
  	},
  };
@@ -903,9 +903,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.45/arch/
  	.alloc_coherent		= sba_alloc_coherent,
  	.free_coherent		= sba_free_coherent,
  	.map_page		= sba_map_page,
-diff -urNp linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c
+--- linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/ia32/binfmt_elf32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
  
  #define elf_read_implies_exec(ex, have_pt_gnu_stack)	(!(have_pt_gnu_stack))
@@ -920,9 +920,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.45/arch/ia
  /* Ugly but avoids duplication */
  #include "../../../fs/binfmt_elf.c"
  
-diff -urNp linux-2.6.32.45/arch/ia64/ia32/ia32priv.h linux-2.6.32.45/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.45/arch/ia64/ia32/ia32priv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/ia32/ia32priv.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/ia32/ia32priv.h linux-2.6.32.46/arch/ia64/ia32/ia32priv.h
+--- linux-2.6.32.46/arch/ia64/ia32/ia32priv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/ia32/ia32priv.h	2011-04-17 15:56:45.000000000 -0400
 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
  #define ELF_DATA	ELFDATA2LSB
  #define ELF_ARCH	EM_386
@@ -939,9 +939,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/ia32/ia32priv.h linux-2.6.32.45/arch/ia64/i
  #define IA32_GATE_OFFSET	IA32_PAGE_OFFSET
  #define IA32_GATE_END		IA32_PAGE_OFFSET + PAGE_SIZE
  
-diff -urNp linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
 @@ -12,7 +12,7 @@
  
  #define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -985,9 +985,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.45/a
  	return ops->dma_supported(dev, mask);
  }
  
-diff -urNp linux-2.6.32.45/arch/ia64/include/asm/elf.h linux-2.6.32.45/arch/ia64/include/asm/elf.h
---- linux-2.6.32.45/arch/ia64/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/include/asm/elf.h linux-2.6.32.46/arch/ia64/include/asm/elf.h
+--- linux-2.6.32.46/arch/ia64/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -43,6 +43,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -1002,9 +1002,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/include/asm/elf.h linux-2.6.32.45/arch/ia64
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-2.6.32.45/arch/ia64/include/asm/machvec.h linux-2.6.32.45/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.45/arch/ia64/include/asm/machvec.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/include/asm/machvec.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/include/asm/machvec.h linux-2.6.32.46/arch/ia64/include/asm/machvec.h
+--- linux-2.6.32.46/arch/ia64/include/asm/machvec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/include/asm/machvec.h	2011-04-17 15:56:45.000000000 -0400
 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
  /* DMA-mapping interface: */
  typedef void ia64_mv_dma_init (void);
@@ -1023,9 +1023,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/include/asm/machvec.h linux-2.6.32.45/arch/
  
  /*
   * Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.32.45/arch/ia64/include/asm/pgtable.h linux-2.6.32.45/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.45/arch/ia64/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/include/asm/pgtable.h linux-2.6.32.46/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.32.46/arch/ia64/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -1053,9 +1053,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/include/asm/pgtable.h linux-2.6.32.45/arch/
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.32.45/arch/ia64/include/asm/spinlock.h linux-2.6.32.45/arch/ia64/include/asm/spinlock.h
---- linux-2.6.32.45/arch/ia64/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/include/asm/spinlock.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/include/asm/spinlock.h linux-2.6.32.46/arch/ia64/include/asm/spinlock.h
+--- linux-2.6.32.46/arch/ia64/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/include/asm/spinlock.h	2011-04-17 15:56:45.000000000 -0400
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -1065,9 +1065,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/include/asm/spinlock.h linux-2.6.32.45/arch
  }
  
  static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
-diff -urNp linux-2.6.32.45/arch/ia64/include/asm/uaccess.h linux-2.6.32.45/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.45/arch/ia64/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/include/asm/uaccess.h linux-2.6.32.46/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/ia64/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -1086,9 +1086,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/include/asm/uaccess.h linux-2.6.32.45/arch/
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/dma-mapping.c	2011-04-17 15:56:45.000000000 -0400
 @@ -3,7 +3,7 @@
  /* Set this to 1 if there is a HW IOMMU in the system */
  int iommu_detected __read_mostly;
@@ -1107,9 +1107,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c linux-2.6.32.45/arch/i
  {
  	return dma_ops;
  }
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/module.c linux-2.6.32.45/arch/ia64/kernel/module.c
---- linux-2.6.32.45/arch/ia64/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/module.c linux-2.6.32.46/arch/ia64/kernel/module.c
+--- linux-2.6.32.46/arch/ia64/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1198,9 +1198,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/module.c linux-2.6.32.45/arch/ia64/k
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/pci-dma.c linux-2.6.32.45/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.45/arch/ia64/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/pci-dma.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-dma.c linux-2.6.32.46/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.32.46/arch/ia64/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/pci-dma.c	2011-04-17 15:56:45.000000000 -0400
 @@ -43,7 +43,7 @@ struct device fallback_dev = {
  	.dma_mask = &fallback_dev.coherent_dma_mask,
  };
@@ -1252,9 +1252,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/pci-dma.c linux-2.6.32.45/arch/ia64/
  
  	/*
  	 * The order of these functions is important for
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/pci-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
  	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
  }
@@ -1264,9 +1264,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.45/arch/i
  	.alloc_coherent = ia64_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
  	.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/sys_ia64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -1299,9 +1299,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c linux-2.6.32.45/arch/ia64
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/topology.c linux-2.6.32.45/arch/ia64/kernel/topology.c
---- linux-2.6.32.45/arch/ia64/kernel/topology.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/topology.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/topology.c linux-2.6.32.46/arch/ia64/kernel/topology.c
+--- linux-2.6.32.46/arch/ia64/kernel/topology.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/topology.c	2011-04-17 15:56:45.000000000 -0400
 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
  	return ret;
  }
@@ -1311,9 +1311,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/topology.c linux-2.6.32.45/arch/ia64
  	.show   = cache_show
  };
  
-diff -urNp linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/kernel/vmlinux.lds.S	2011-04-17 15:56:45.000000000 -0400
 @@ -190,7 +190,7 @@ SECTIONS
    /* Per-cpu data: */
    . = ALIGN(PERCPU_PAGE_SIZE);
@@ -1323,9 +1323,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.45/arch/i
    . = __phys_per_cpu_start + PERCPU_PAGE_SIZE;	/* ensure percpu data fits
    						 * into percpu page size
  						 */
-diff -urNp linux-2.6.32.45/arch/ia64/mm/fault.c linux-2.6.32.45/arch/ia64/mm/fault.c
---- linux-2.6.32.45/arch/ia64/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/mm/fault.c linux-2.6.32.46/arch/ia64/mm/fault.c
+--- linux-2.6.32.46/arch/ia64/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1375,9 +1375,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/mm/fault.c linux-2.6.32.45/arch/ia64/mm/fau
    survive:
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/mm/hugetlbpage.c	2011-04-17 15:56:45.000000000 -0400
 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(
  		/* At this point:  (!vmm || addr < vmm->vm_end). */
  		if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1387,9 +1387,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c linux-2.6.32.45/arch/ia64/
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-2.6.32.45/arch/ia64/mm/init.c linux-2.6.32.45/arch/ia64/mm/init.c
---- linux-2.6.32.45/arch/ia64/mm/init.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/mm/init.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/mm/init.c linux-2.6.32.46/arch/ia64/mm/init.c
+--- linux-2.6.32.46/arch/ia64/mm/init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/mm/init.c	2011-04-17 15:56:45.000000000 -0400
 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1410,9 +1410,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/mm/init.c linux-2.6.32.45/arch/ia64/mm/init
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/ia64/sn/pci/pci_dma.c	2011-04-17 15:56:45.000000000 -0400
 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
  	return ret;
  }
@@ -1422,9 +1422,9 @@ diff -urNp linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.45/arch/ia64/
  	.alloc_coherent		= sn_dma_alloc_coherent,
  	.free_coherent		= sn_dma_free_coherent,
  	.map_page		= sn_dma_map_page,
-diff -urNp linux-2.6.32.45/arch/m32r/lib/usercopy.c linux-2.6.32.45/arch/m32r/lib/usercopy.c
---- linux-2.6.32.45/arch/m32r/lib/usercopy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/m32r/lib/usercopy.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/m32r/lib/usercopy.c linux-2.6.32.46/arch/m32r/lib/usercopy.c
+--- linux-2.6.32.46/arch/m32r/lib/usercopy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/m32r/lib/usercopy.c	2011-04-17 15:56:45.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1445,9 +1445,9 @@ diff -urNp linux-2.6.32.45/arch/m32r/lib/usercopy.c linux-2.6.32.45/arch/m32r/li
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -78,7 +78,7 @@ static void db1x_pm_end(void)
  
  }
@@ -1457,9 +1457,9 @@ diff -urNp linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c linux-2.6.32.45/arch
  	.valid		= suspend_valid_only_mem,
  	.begin		= db1x_pm_begin,
  	.enter		= db1x_pm_enter,
-diff -urNp linux-2.6.32.45/arch/mips/include/asm/elf.h linux-2.6.32.45/arch/mips/include/asm/elf.h
---- linux-2.6.32.45/arch/mips/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/include/asm/elf.h linux-2.6.32.46/arch/mips/include/asm/elf.h
+--- linux-2.6.32.46/arch/mips/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1472,9 +1472,9 @@ diff -urNp linux-2.6.32.45/arch/mips/include/asm/elf.h linux-2.6.32.45/arch/mips
 +#endif
 +
  #endif /* _ASM_ELF_H */
-diff -urNp linux-2.6.32.45/arch/mips/include/asm/page.h linux-2.6.32.45/arch/mips/include/asm/page.h
---- linux-2.6.32.45/arch/mips/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/include/asm/page.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/include/asm/page.h linux-2.6.32.46/arch/mips/include/asm/page.h
+--- linux-2.6.32.46/arch/mips/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/include/asm/page.h	2011-04-17 15:56:45.000000000 -0400
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1484,9 +1484,9 @@ diff -urNp linux-2.6.32.45/arch/mips/include/asm/page.h linux-2.6.32.45/arch/mip
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-2.6.32.45/arch/mips/include/asm/reboot.h linux-2.6.32.45/arch/mips/include/asm/reboot.h
---- linux-2.6.32.45/arch/mips/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/include/asm/reboot.h	2011-08-21 17:35:02.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/include/asm/reboot.h linux-2.6.32.46/arch/mips/include/asm/reboot.h
+--- linux-2.6.32.46/arch/mips/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/include/asm/reboot.h	2011-08-21 17:35:02.000000000 -0400
 @@ -9,7 +9,7 @@
  #ifndef _ASM_REBOOT_H
  #define _ASM_REBOOT_H
@@ -1497,9 +1497,9 @@ diff -urNp linux-2.6.32.45/arch/mips/include/asm/reboot.h linux-2.6.32.45/arch/m
 +extern void (*__noreturn _machine_halt)(void);
  
  #endif /* _ASM_REBOOT_H */
-diff -urNp linux-2.6.32.45/arch/mips/include/asm/system.h linux-2.6.32.45/arch/mips/include/asm/system.h
---- linux-2.6.32.45/arch/mips/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/include/asm/system.h linux-2.6.32.46/arch/mips/include/asm/system.h
+--- linux-2.6.32.46/arch/mips/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1508,9 +1508,9 @@ diff -urNp linux-2.6.32.45/arch/mips/include/asm/system.h linux-2.6.32.45/arch/m
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/kernel/binfmt_elfn32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1525,9 +1525,9 @@ diff -urNp linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.45/arch
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/kernel/binfmt_elfo32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1542,9 +1542,9 @@ diff -urNp linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.45/arch
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-2.6.32.45/arch/mips/kernel/kgdb.c linux-2.6.32.45/arch/mips/kernel/kgdb.c
---- linux-2.6.32.45/arch/mips/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/kernel/kgdb.c linux-2.6.32.46/arch/mips/kernel/kgdb.c
+--- linux-2.6.32.46/arch/mips/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
  	return -1;
  }
@@ -1553,9 +1553,9 @@ diff -urNp linux-2.6.32.45/arch/mips/kernel/kgdb.c linux-2.6.32.45/arch/mips/ker
  struct kgdb_arch arch_kgdb_ops;
  
  /*
-diff -urNp linux-2.6.32.45/arch/mips/kernel/process.c linux-2.6.32.45/arch/mips/kernel/process.c
---- linux-2.6.32.45/arch/mips/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/kernel/process.c linux-2.6.32.46/arch/mips/kernel/process.c
+--- linux-2.6.32.46/arch/mips/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
@@ -1572,9 +1572,9 @@ diff -urNp linux-2.6.32.45/arch/mips/kernel/process.c linux-2.6.32.45/arch/mips/
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-2.6.32.45/arch/mips/kernel/reset.c linux-2.6.32.45/arch/mips/kernel/reset.c
---- linux-2.6.32.45/arch/mips/kernel/reset.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/kernel/reset.c	2011-08-21 17:35:26.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/kernel/reset.c linux-2.6.32.46/arch/mips/kernel/reset.c
+--- linux-2.6.32.46/arch/mips/kernel/reset.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/kernel/reset.c	2011-08-21 17:35:26.000000000 -0400
 @@ -19,8 +19,8 @@
   * So handle all using function pointers to machine specific
   * functions.
@@ -1606,9 +1606,9 @@ diff -urNp linux-2.6.32.45/arch/mips/kernel/reset.c linux-2.6.32.45/arch/mips/ke
  		pm_power_off();
 +	BUG();
  }
-diff -urNp linux-2.6.32.45/arch/mips/kernel/syscall.c linux-2.6.32.45/arch/mips/kernel/syscall.c
---- linux-2.6.32.45/arch/mips/kernel/syscall.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/kernel/syscall.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/kernel/syscall.c linux-2.6.32.46/arch/mips/kernel/syscall.c
+--- linux-2.6.32.46/arch/mips/kernel/syscall.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/kernel/syscall.c	2011-04-17 15:56:45.000000000 -0400
 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
@@ -1643,9 +1643,9 @@ diff -urNp linux-2.6.32.45/arch/mips/kernel/syscall.c linux-2.6.32.45/arch/mips/
  			return addr;
  		addr = vmm->vm_end;
  		if (do_color_align)
-diff -urNp linux-2.6.32.45/arch/mips/Makefile linux-2.6.32.45/arch/mips/Makefile
---- linux-2.6.32.45/arch/mips/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/Makefile	2011-08-21 19:26:52.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/Makefile linux-2.6.32.46/arch/mips/Makefile
+--- linux-2.6.32.46/arch/mips/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/Makefile	2011-08-21 19:26:52.000000000 -0400
 @@ -51,6 +51,8 @@ endif
  cflags-y := -ffunction-sections
  cflags-y += $(call cc-option, -mno-check-zero-division)
@@ -1655,9 +1655,9 @@ diff -urNp linux-2.6.32.45/arch/mips/Makefile linux-2.6.32.45/arch/mips/Makefile
  ifdef CONFIG_32BIT
  ld-emul			= $(32bit-emul)
  vmlinux-32		= vmlinux
-diff -urNp linux-2.6.32.45/arch/mips/mm/fault.c linux-2.6.32.45/arch/mips/mm/fault.c
---- linux-2.6.32.45/arch/mips/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/mips/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/mips/mm/fault.c linux-2.6.32.46/arch/mips/mm/fault.c
+--- linux-2.6.32.46/arch/mips/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -26,6 +26,23 @@
  #include <asm/ptrace.h>
  #include <asm/highmem.h>		/* For VMALLOC_END */
@@ -1682,9 +1682,9 @@ diff -urNp linux-2.6.32.45/arch/mips/mm/fault.c linux-2.6.32.45/arch/mips/mm/fau
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.32.45/arch/parisc/include/asm/elf.h linux-2.6.32.45/arch/parisc/include/asm/elf.h
---- linux-2.6.32.45/arch/parisc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/parisc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/parisc/include/asm/elf.h linux-2.6.32.46/arch/parisc/include/asm/elf.h
+--- linux-2.6.32.46/arch/parisc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/parisc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -343,6 +343,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1699,9 +1699,9 @@ diff -urNp linux-2.6.32.45/arch/parisc/include/asm/elf.h linux-2.6.32.45/arch/pa
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-2.6.32.45/arch/parisc/include/asm/pgtable.h linux-2.6.32.45/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.45/arch/parisc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/parisc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/parisc/include/asm/pgtable.h linux-2.6.32.46/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.32.46/arch/parisc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/parisc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -207,6 +207,17 @@
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1720,9 +1720,9 @@ diff -urNp linux-2.6.32.45/arch/parisc/include/asm/pgtable.h linux-2.6.32.45/arc
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_RO	__pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
  #define PAGE_KERNEL_UNC	__pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.32.45/arch/parisc/kernel/module.c linux-2.6.32.45/arch/parisc/kernel/module.c
---- linux-2.6.32.45/arch/parisc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/parisc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/parisc/kernel/module.c linux-2.6.32.46/arch/parisc/kernel/module.c
+--- linux-2.6.32.46/arch/parisc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/parisc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -95,16 +95,38 @@
  
  /* three functions to determine where in the module core
@@ -1823,9 +1823,9 @@ diff -urNp linux-2.6.32.45/arch/parisc/kernel/module.c linux-2.6.32.45/arch/pari
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/parisc/kernel/sys_parisc.c	2011-04-17 15:56:45.000000000 -0400
 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (TASK_SIZE - len < addr)
@@ -1853,9 +1853,9 @@ diff -urNp linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c linux-2.6.32.45/arch/
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.32.45/arch/parisc/kernel/traps.c linux-2.6.32.45/arch/parisc/kernel/traps.c
---- linux-2.6.32.45/arch/parisc/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/parisc/kernel/traps.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/parisc/kernel/traps.c linux-2.6.32.46/arch/parisc/kernel/traps.c
+--- linux-2.6.32.46/arch/parisc/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/parisc/kernel/traps.c	2011-04-17 15:56:45.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
@@ -1867,9 +1867,9 @@ diff -urNp linux-2.6.32.45/arch/parisc/kernel/traps.c linux-2.6.32.45/arch/paris
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-2.6.32.45/arch/parisc/mm/fault.c linux-2.6.32.45/arch/parisc/mm/fault.c
---- linux-2.6.32.45/arch/parisc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/parisc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/parisc/mm/fault.c linux-2.6.32.46/arch/parisc/mm/fault.c
+--- linux-2.6.32.46/arch/parisc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/parisc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -2039,9 +2039,9 @@ diff -urNp linux-2.6.32.45/arch/parisc/mm/fault.c linux-2.6.32.45/arch/parisc/mm
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/device.h linux-2.6.32.45/arch/powerpc/include/asm/device.h
---- linux-2.6.32.45/arch/powerpc/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/device.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/device.h linux-2.6.32.46/arch/powerpc/include/asm/device.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/device.h	2011-04-17 15:56:45.000000000 -0400
 @@ -14,7 +14,7 @@ struct dev_archdata {
  	struct device_node	*of_node;
  
@@ -2051,9 +2051,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/device.h linux-2.6.32.45/arc
  
  	/*
  	 * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/dma-mapping.h	2011-04-17 15:56:45.000000000 -0400
 @@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
  #ifdef CONFIG_PPC64
  extern struct dma_map_ops dma_iommu_ops;
@@ -2120,9 +2120,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.4
  
  	if (dma_ops->mapping_error)
  		return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/elf.h linux-2.6.32.45/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.45/arch/powerpc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/elf.h linux-2.6.32.46/arch/powerpc/include/asm/elf.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -2155,9 +2155,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/elf.h linux-2.6.32.45/arch/p
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/iommu.h linux-2.6.32.45/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.45/arch/powerpc/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/iommu.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/iommu.h linux-2.6.32.46/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/iommu.h	2011-04-17 15:56:45.000000000 -0400
 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
  extern void iommu_init_early_dart(void);
  extern void iommu_init_early_pasemi(void);
@@ -2168,9 +2168,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/iommu.h linux-2.6.32.45/arch
  #ifdef CONFIG_PCI
  extern void pci_iommu_init(void);
  extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h	2011-04-17 15:56:45.000000000 -0400
 @@ -26,6 +26,7 @@ enum km_type {
  	KM_SOFTIRQ1,
  	KM_PPC_SYNC_PAGE,
@@ -2179,9 +2179,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.45
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/page_64.h linux-2.6.32.45/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.45/arch/powerpc/include/asm/page_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/page_64.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page_64.h linux-2.6.32.46/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/page_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/page_64.h	2011-04-17 15:56:45.000000000 -0400
 @@ -180,15 +180,18 @@ do {						\
   * stack by default, so in the absense of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -2203,9 +2203,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/page_64.h linux-2.6.32.45/ar
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/page.h linux-2.6.32.45/arch/powerpc/include/asm/page.h
---- linux-2.6.32.45/arch/powerpc/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/page.h	2011-08-21 16:07:39.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page.h linux-2.6.32.46/arch/powerpc/include/asm/page.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/page.h	2011-08-21 16:07:39.000000000 -0400
 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -2228,9 +2228,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/page.h linux-2.6.32.45/arch/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pci.h linux-2.6.32.45/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.45/arch/powerpc/include/asm/pci.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/pci.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pci.h linux-2.6.32.46/arch/powerpc/include/asm/pci.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/pci.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/pci.h	2011-04-17 15:56:45.000000000 -0400
 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
  }
  
@@ -2242,9 +2242,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pci.h linux-2.6.32.45/arch/p
  #else	/* CONFIG_PCI */
  #define set_pci_dma_ops(d)
  #define get_pci_dma_ops()	NULL
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h
---- linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/pgtable.h	2011-04-17 15:56:45.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -2253,9 +2253,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h linux-2.6.32.45/ar
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/pte-hash32.h	2011-04-17 15:56:45.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -2264,9 +2264,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.45
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h
---- linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h	2011-08-21 15:53:58.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/ptrace.h	2011-08-21 15:53:58.000000000 -0400
 @@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct p
  	} while(0)
  
@@ -2276,9 +2276,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h linux-2.6.32.45/arc
  extern int ptrace_put_reg(struct task_struct *task, int regno,
  			  unsigned long data);
  
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/reg.h linux-2.6.32.45/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.45/arch/powerpc/include/asm/reg.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/reg.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/reg.h linux-2.6.32.46/arch/powerpc/include/asm/reg.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/reg.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/reg.h	2011-04-17 15:56:45.000000000 -0400
 @@ -191,6 +191,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
@@ -2287,9 +2287,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/reg.h linux-2.6.32.45/arch/p
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/swiotlb.h	2011-04-17 15:56:45.000000000 -0400
 @@ -13,7 +13,7 @@
  
  #include <linux/swiotlb.h>
@@ -2299,9 +2299,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.45/ar
  
  static inline void dma_mark_clean(void *addr, size_t size) {}
  
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/system.h linux-2.6.32.45/arch/powerpc/include/asm/system.h
---- linux-2.6.32.45/arch/powerpc/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/system.h linux-2.6.32.46/arch/powerpc/include/asm/system.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
@@ -2311,9 +2311,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/system.h linux-2.6.32.45/arc
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -2491,9 +2491,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h linux-2.6.32.45/ar
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c
+--- linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c	2011-04-17 15:56:45.000000000 -0400
 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
  	&cache_assoc_attr,
  };
@@ -2503,9 +2503,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.45/arch/
  	.show = cache_index_show,
  };
  
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma.c linux-2.6.32.45/arch/powerpc/kernel/dma.c
---- linux-2.6.32.45/arch/powerpc/kernel/dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/dma.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma.c linux-2.6.32.46/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.46/arch/powerpc/kernel/dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/dma.c	2011-04-17 15:56:45.000000000 -0400
 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
  }
  #endif
@@ -2515,9 +2515,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma.c linux-2.6.32.45/arch/powerp
  	.alloc_coherent	= dma_direct_alloc_coherent,
  	.free_coherent	= dma_direct_free_coherent,
  	.map_sg		= dma_direct_map_sg,
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
  }
  
@@ -2527,9 +2527,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.45/arch/
  {
  	struct iommu_table *tbl = get_iommu_table_base(dev);
  
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
   * map_page, and unmap_page on highmem, use normal dma_ops
   * for everything else.
@@ -2539,9 +2539,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.45/arc
  	.alloc_coherent = dma_direct_alloc_coherent,
  	.free_coherent = dma_direct_free_coherent,
  	.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S	2011-04-17 15:56:45.000000000 -0400
 @@ -455,6 +455,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
@@ -2560,9 +2560,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.45/
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64s.S	2011-04-17 15:56:45.000000000 -0400
 @@ -818,10 +818,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
@@ -2575,9 +2575,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.45/
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/ibmebus.c	2011-04-17 15:56:45.000000000 -0400
 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 
  	return 1;
  }
@@ -2587,9 +2587,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c linux-2.6.32.45/arch/po
  	.alloc_coherent = ibmebus_alloc_coherent,
  	.free_coherent  = ibmebus_free_coherent,
  	.map_sg         = ibmebus_map_sg,
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/kgdb.c linux-2.6.32.45/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.45/arch/powerpc/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/kgdb.c linux-2.6.32.46/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.32.46/arch/powerpc/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/kgdb.c	2011-04-17 15:56:45.000000000 -0400
 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
  	if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
  		return 0;
@@ -2608,9 +2608,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/kgdb.c linux-2.6.32.45/arch/power
  	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/module_32.c linux-2.6.32.45/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.45/arch/powerpc/kernel/module_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/module_32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module_32.c linux-2.6.32.46/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.46/arch/powerpc/kernel/module_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/module_32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
  			me->arch.core_plt_section = i;
  	}
@@ -2640,9 +2640,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/module_32.c linux-2.6.32.45/arch/
  
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/module.c linux-2.6.32.45/arch/powerpc/kernel/module.c
---- linux-2.6.32.45/arch/powerpc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module.c linux-2.6.32.46/arch/powerpc/kernel/module.c
+--- linux-2.6.32.46/arch/powerpc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2682,9 +2682,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/module.c linux-2.6.32.45/arch/pow
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/pci-common.c linux-2.6.32.45/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.45/arch/powerpc/kernel/pci-common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/pci-common.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/pci-common.c linux-2.6.32.46/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.32.46/arch/powerpc/kernel/pci-common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/pci-common.c	2011-04-17 15:56:45.000000000 -0400
 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
  unsigned int ppc_pci_flags = 0;
  
@@ -2703,9 +2703,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/pci-common.c linux-2.6.32.45/arch
  {
  	return pci_dma_ops;
  }
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/process.c linux-2.6.32.45/arch/powerpc/kernel/process.c
---- linux-2.6.32.45/arch/powerpc/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/process.c linux-2.6.32.46/arch/powerpc/kernel/process.c
+--- linux-2.6.32.46/arch/powerpc/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
  	 * Lookup NIP late so we have the best change of getting the
  	 * above info out without failing
@@ -2798,9 +2798,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/process.c linux-2.6.32.45/arch/po
 -
 -	return ret;
 -}
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/ptrace.c linux-2.6.32.45/arch/powerpc/kernel/ptrace.c
---- linux-2.6.32.45/arch/powerpc/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/ptrace.c	2011-08-21 15:53:39.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/ptrace.c linux-2.6.32.46/arch/powerpc/kernel/ptrace.c
+--- linux-2.6.32.46/arch/powerpc/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/ptrace.c	2011-08-21 15:53:39.000000000 -0400
 @@ -86,7 +86,7 @@ static int set_user_trap(struct task_str
  /*
   * Get contents of register REGNO in task TASK.
@@ -2819,9 +2819,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/ptrace.c linux-2.6.32.45/arch/pow
  		} else {
  			flush_fp_to_thread(child);
  			tmp = ((unsigned long *)child->thread.fpr)
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/signal_32.c linux-2.6.32.45/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.45/arch/powerpc/kernel/signal_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/signal_32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_32.c linux-2.6.32.46/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.32.46/arch/powerpc/kernel/signal_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/signal_32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
@@ -2831,9 +2831,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/signal_32.c linux-2.6.32.45/arch/
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/signal_64.c linux-2.6.32.45/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.45/arch/powerpc/kernel/signal_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/signal_64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/signal_64.c linux-2.6.32.46/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.32.46/arch/powerpc/kernel/signal_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/signal_64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
@@ -2843,9 +2843,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/signal_64.c linux-2.6.32.45/arch/
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c
+--- linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/sys_ppc32.c	2011-04-17 15:56:45.000000000 -0400
 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
  	if (oldlenp) {
  		if (!error) {
@@ -2859,9 +2859,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.45/arch/
  	}
  	return error;
  }
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/traps.c linux-2.6.32.45/arch/powerpc/kernel/traps.c
---- linux-2.6.32.45/arch/powerpc/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/traps.c	2011-06-13 21:33:37.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/traps.c linux-2.6.32.46/arch/powerpc/kernel/traps.c
+--- linux-2.6.32.46/arch/powerpc/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/traps.c	2011-06-13 21:33:37.000000000 -0400
 @@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void)
  static inline void pmac_backlight_unblank(void) { }
  #endif
@@ -2880,9 +2880,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/traps.c linux-2.6.32.45/arch/powe
  	oops_exit();
  	do_exit(err);
  
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/vdso.c linux-2.6.32.45/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.45/arch/powerpc/kernel/vdso.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/vdso.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vdso.c linux-2.6.32.46/arch/powerpc/kernel/vdso.c
+--- linux-2.6.32.46/arch/powerpc/kernel/vdso.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/vdso.c	2011-04-17 15:56:45.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2909,9 +2909,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/vdso.c linux-2.6.32.45/arch/power
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-2.6.32.45/arch/powerpc/kernel/vio.c linux-2.6.32.45/arch/powerpc/kernel/vio.c
---- linux-2.6.32.45/arch/powerpc/kernel/vio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/kernel/vio.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/vio.c linux-2.6.32.46/arch/powerpc/kernel/vio.c
+--- linux-2.6.32.46/arch/powerpc/kernel/vio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/vio.c	2011-04-17 15:56:45.000000000 -0400
 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
  	vio_cmo_dealloc(viodev, alloc_size);
  }
@@ -2934,9 +2934,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/kernel/vio.c linux-2.6.32.45/arch/powerp
  	viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
  }
  
-diff -urNp linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2968,9 +2968,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c linux-2.6.32.45/arch/p
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.45/arch/powerpc/Makefile linux-2.6.32.45/arch/powerpc/Makefile
---- linux-2.6.32.45/arch/powerpc/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/Makefile	2011-08-21 19:27:08.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/Makefile linux-2.6.32.46/arch/powerpc/Makefile
+--- linux-2.6.32.46/arch/powerpc/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/Makefile	2011-08-21 19:27:08.000000000 -0400
 @@ -74,6 +74,8 @@ KBUILD_AFLAGS	+= -Iarch/$(ARCH)
  KBUILD_CFLAGS	+= -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
  CPP		= $(CC) -E $(KBUILD_CFLAGS)
@@ -2980,9 +2980,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/Makefile linux-2.6.32.45/arch/powerpc/Ma
  CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
  
  ifeq ($(CONFIG_PPC64),y)
-diff -urNp linux-2.6.32.45/arch/powerpc/mm/fault.c linux-2.6.32.45/arch/powerpc/mm/fault.c
---- linux-2.6.32.45/arch/powerpc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/mm/fault.c linux-2.6.32.46/arch/powerpc/mm/fault.c
+--- linux-2.6.32.46/arch/powerpc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
 @@ -30,6 +30,10 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -3087,9 +3087,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/mm/fault.c linux-2.6.32.45/arch/powerpc/
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-2.6.32.45/arch/powerpc/mm/mem.c linux-2.6.32.45/arch/powerpc/mm/mem.c
---- linux-2.6.32.45/arch/powerpc/mm/mem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/mm/mem.c	2011-08-21 15:50:39.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/mm/mem.c linux-2.6.32.46/arch/powerpc/mm/mem.c
+--- linux-2.6.32.46/arch/powerpc/mm/mem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/mm/mem.c	2011-08-21 15:50:39.000000000 -0400
 @@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(voi
  {
  	unsigned long lmb_next_region_start_pfn,
@@ -3099,9 +3099,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/mm/mem.c linux-2.6.32.45/arch/powerpc/mm
  
  	for (i = 0; i < lmb.memory.cnt - 1; i++) {
  		lmb_region_max_pfn =
-diff -urNp linux-2.6.32.45/arch/powerpc/mm/mmap_64.c linux-2.6.32.45/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.45/arch/powerpc/mm/mmap_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/mm/mmap_64.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/mm/mmap_64.c linux-2.6.32.46/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.32.46/arch/powerpc/mm/mmap_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/mm/mmap_64.c	2011-04-17 15:56:45.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -3125,9 +3125,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/mm/mmap_64.c linux-2.6.32.45/arch/powerp
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.45/arch/powerpc/mm/slice.c linux-2.6.32.45/arch/powerpc/mm/slice.c
---- linux-2.6.32.45/arch/powerpc/mm/slice.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/mm/slice.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/mm/slice.c linux-2.6.32.46/arch/powerpc/mm/slice.c
+--- linux-2.6.32.46/arch/powerpc/mm/slice.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/mm/slice.c	2011-04-17 15:56:45.000000000 -0400
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
@@ -3194,9 +3194,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/mm/slice.c linux-2.6.32.45/arch/powerpc/
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/platforms/52xx/lite5200_pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
  	lite5200_pm_target_state = PM_SUSPEND_ON;
  }
@@ -3206,9 +3206,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
  	.valid		= lite5200_pm_valid,
  	.begin		= lite5200_pm_begin,
  	.prepare	= lite5200_pm_prepare,
-diff -urNp linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/platforms/52xx/mpc52xx_pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
  	iounmap(mbar);
  }
@@ -3218,9 +3218,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
  	.valid		= mpc52xx_pm_valid,
  	.prepare	= mpc52xx_pm_prepare,
  	.enter		= mpc52xx_pm_enter,
-diff -urNp linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/platforms/83xx/suspend.c	2011-04-17 15:56:45.000000000 -0400
 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
  	return ret;
  }
@@ -3230,9 +3230,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.45
  	.valid = mpc83xx_suspend_valid,
  	.begin = mpc83xx_suspend_begin,
  	.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/platforms/cell/iommu.c	2011-04-17 15:56:45.000000000 -0400
 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
  
  static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -3242,9 +3242,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.45/a
  	.alloc_coherent = dma_fixed_alloc_coherent,
  	.free_coherent  = dma_fixed_free_coherent,
  	.map_sg         = dma_fixed_map_sg,
-diff -urNp linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/platforms/ps3/system-bus.c	2011-04-17 15:56:45.000000000 -0400
 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
  	return mask >= DMA_BIT_MASK(32);
  }
@@ -3263,9 +3263,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
  	.alloc_coherent = ps3_alloc_coherent,
  	.free_coherent = ps3_free_coherent,
  	.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig
+--- linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig	2011-04-17 15:56:45.000000000 -0400
 @@ -2,6 +2,8 @@ config PPC_PSERIES
  	depends on PPC64 && PPC_BOOK3S
  	bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -3275,9 +3275,9 @@ diff -urNp linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.4
  	select PPC_I8259
  	select PPC_RTAS
  	select RTAS_ERROR_LOGGING
-diff -urNp linux-2.6.32.45/arch/s390/include/asm/elf.h linux-2.6.32.45/arch/s390/include/asm/elf.h
---- linux-2.6.32.45/arch/s390/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/include/asm/elf.h linux-2.6.32.46/arch/s390/include/asm/elf.h
+--- linux-2.6.32.46/arch/s390/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
     that it will "exec", and that there is sufficient room for the brk.  */
  #define ELF_ET_DYN_BASE		(STACK_TOP / 3 * 2)
@@ -3292,9 +3292,9 @@ diff -urNp linux-2.6.32.45/arch/s390/include/asm/elf.h linux-2.6.32.45/arch/s390
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
  
-diff -urNp linux-2.6.32.45/arch/s390/include/asm/setup.h linux-2.6.32.45/arch/s390/include/asm/setup.h
---- linux-2.6.32.45/arch/s390/include/asm/setup.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/include/asm/setup.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/include/asm/setup.h linux-2.6.32.46/arch/s390/include/asm/setup.h
+--- linux-2.6.32.46/arch/s390/include/asm/setup.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/include/asm/setup.h	2011-04-17 15:56:45.000000000 -0400
 @@ -50,13 +50,13 @@ extern unsigned long memory_end;
  void detect_memory_layout(struct mem_chunk chunk[]);
  
@@ -3311,9 +3311,9 @@ diff -urNp linux-2.6.32.45/arch/s390/include/asm/setup.h linux-2.6.32.45/arch/s3
  #else
  #define s390_noexec	(0)
  #endif
-diff -urNp linux-2.6.32.45/arch/s390/include/asm/uaccess.h linux-2.6.32.45/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.45/arch/s390/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/include/asm/uaccess.h linux-2.6.32.46/arch/s390/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/s390/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/include/asm/uaccess.h	2011-04-17 15:56:45.000000000 -0400
 @@ -232,6 +232,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -3346,9 +3346,9 @@ diff -urNp linux-2.6.32.45/arch/s390/include/asm/uaccess.h linux-2.6.32.45/arch/
  	if (access_ok(VERIFY_READ, from, n))
  		n = __copy_from_user(to, from, n);
  	else
-diff -urNp linux-2.6.32.45/arch/s390/Kconfig linux-2.6.32.45/arch/s390/Kconfig
---- linux-2.6.32.45/arch/s390/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/Kconfig	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/Kconfig linux-2.6.32.46/arch/s390/Kconfig
+--- linux-2.6.32.46/arch/s390/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/Kconfig	2011-04-17 15:56:45.000000000 -0400
 @@ -194,28 +194,26 @@ config AUDIT_ARCH
  
  config S390_SWITCH_AMODE
@@ -3386,9 +3386,9 @@ diff -urNp linux-2.6.32.45/arch/s390/Kconfig linux-2.6.32.45/arch/s390/Kconfig
  
  comment "Code generation options"
  
-diff -urNp linux-2.6.32.45/arch/s390/kernel/module.c linux-2.6.32.45/arch/s390/kernel/module.c
---- linux-2.6.32.45/arch/s390/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/kernel/module.c linux-2.6.32.46/arch/s390/kernel/module.c
+--- linux-2.6.32.46/arch/s390/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
@@ -3460,9 +3460,9 @@ diff -urNp linux-2.6.32.45/arch/s390/kernel/module.c linux-2.6.32.45/arch/s390/k
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-2.6.32.45/arch/s390/kernel/setup.c linux-2.6.32.45/arch/s390/kernel/setup.c
---- linux-2.6.32.45/arch/s390/kernel/setup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/kernel/setup.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/kernel/setup.c linux-2.6.32.46/arch/s390/kernel/setup.c
+--- linux-2.6.32.46/arch/s390/kernel/setup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/kernel/setup.c	2011-04-17 15:56:45.000000000 -0400
 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
  early_param("mem", early_parse_mem);
  
@@ -3516,9 +3516,9 @@ diff -urNp linux-2.6.32.45/arch/s390/kernel/setup.c linux-2.6.32.45/arch/s390/ke
  static void setup_addressing_mode(void)
  {
  	if (s390_noexec) {
-diff -urNp linux-2.6.32.45/arch/s390/mm/mmap.c linux-2.6.32.45/arch/s390/mm/mmap.c
---- linux-2.6.32.45/arch/s390/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/s390/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/s390/mm/mmap.c linux-2.6.32.46/arch/s390/mm/mmap.c
+--- linux-2.6.32.46/arch/s390/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/mm/mmap.c	2011-04-17 15:56:45.000000000 -0400
 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -3565,9 +3565,9 @@ diff -urNp linux-2.6.32.45/arch/s390/mm/mmap.c linux-2.6.32.45/arch/s390/mm/mmap
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.45/arch/score/include/asm/system.h linux-2.6.32.45/arch/score/include/asm/system.h
---- linux-2.6.32.45/arch/score/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/score/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/score/include/asm/system.h linux-2.6.32.46/arch/score/include/asm/system.h
+--- linux-2.6.32.46/arch/score/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/score/include/asm/system.h	2011-04-17 15:56:45.000000000 -0400
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -3577,9 +3577,9 @@ diff -urNp linux-2.6.32.45/arch/score/include/asm/system.h linux-2.6.32.45/arch/
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-2.6.32.45/arch/score/kernel/process.c linux-2.6.32.45/arch/score/kernel/process.c
---- linux-2.6.32.45/arch/score/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/score/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/score/kernel/process.c linux-2.6.32.46/arch/score/kernel/process.c
+--- linux-2.6.32.46/arch/score/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/score/kernel/process.c	2011-04-17 15:56:45.000000000 -0400
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
@@ -3589,9 +3589,9 @@ diff -urNp linux-2.6.32.45/arch/score/kernel/process.c linux-2.6.32.45/arch/scor
 -{
 -	return sp;
 -}
-diff -urNp linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sh/boards/mach-hp6xx/pm.c	2011-04-17 15:56:45.000000000 -0400
 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
  	return 0;
  }
@@ -3601,9 +3601,9 @@ diff -urNp linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.45/arch/s
  	.enter		= hp6x0_pm_enter,
  	.valid		= suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c
+--- linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sh/kernel/cpu/sh4/sq.c	2011-04-17 15:56:46.000000000 -0400
 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
  	NULL,
  };
@@ -3613,9 +3613,9 @@ diff -urNp linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.45/arch/sh/k
  	.show	= sq_sysfs_show,
  	.store	= sq_sysfs_store,
  };
-diff -urNp linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sh/kernel/cpu/shmobile/pm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
  	return 0;
  }
@@ -3625,9 +3625,9 @@ diff -urNp linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.45/arch
  	.enter          = sh_pm_enter,
  	.valid          = suspend_valid_only_mem,
  };
-diff -urNp linux-2.6.32.45/arch/sh/kernel/kgdb.c linux-2.6.32.45/arch/sh/kernel/kgdb.c
---- linux-2.6.32.45/arch/sh/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sh/kernel/kgdb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sh/kernel/kgdb.c linux-2.6.32.46/arch/sh/kernel/kgdb.c
+--- linux-2.6.32.46/arch/sh/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sh/kernel/kgdb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -3637,9 +3637,9 @@ diff -urNp linux-2.6.32.45/arch/sh/kernel/kgdb.c linux-2.6.32.45/arch/sh/kernel/
  	/* Breakpoint instruction: trapa #0x3c */
  #ifdef CONFIG_CPU_LITTLE_ENDIAN
  	.gdb_bpt_instr		= { 0x3c, 0xc3 },
-diff -urNp linux-2.6.32.45/arch/sh/mm/mmap.c linux-2.6.32.45/arch/sh/mm/mmap.c
---- linux-2.6.32.45/arch/sh/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sh/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sh/mm/mmap.c linux-2.6.32.46/arch/sh/mm/mmap.c
+--- linux-2.6.32.46/arch/sh/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sh/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
@@ -3714,9 +3714,9 @@ diff -urNp linux-2.6.32.45/arch/sh/mm/mmap.c linux-2.6.32.45/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h	2011-08-18 23:11:34.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h	2011-08-18 23:11:34.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -3909,9 +3909,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h linux-2.6.32.45/ar
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/cache.h linux-2.6.32.45/arch/sparc/include/asm/cache.h
---- linux-2.6.32.45/arch/sparc/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/cache.h	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/cache.h linux-2.6.32.46/arch/sparc/include/asm/cache.h
+--- linux-2.6.32.46/arch/sparc/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/cache.h	2011-07-06 19:53:33.000000000 -0400
 @@ -8,7 +8,7 @@
  #define _SPARC_CACHE_H
  
@@ -3921,9 +3921,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/cache.h linux-2.6.32.45/arch/s
  #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)))
  
  #ifdef CONFIG_SPARC32
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
  #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
  #define dma_is_consistent(d, h)	(1)
@@ -3955,9 +3955,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.45/
  
  	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
  	ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/elf_32.h linux-2.6.32.45/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.45/arch/sparc/include/asm/elf_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/elf_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_32.h linux-2.6.32.46/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.32.46/arch/sparc/include/asm/elf_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/elf_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -116,6 +116,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3972,9 +3972,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/elf_32.h linux-2.6.32.45/arch/
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/elf_64.h linux-2.6.32.45/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.45/arch/sparc/include/asm/elf_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/elf_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/elf_64.h linux-2.6.32.46/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.32.46/arch/sparc/include/asm/elf_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/elf_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -163,6 +163,12 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
@@ -3988,9 +3988,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/elf_64.h linux-2.6.32.45/arch/
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  */
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -4022,9 +4022,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.45/a
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/pgtsrmmu.h	2011-04-17 15:56:46.000000000 -0400
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -4039,9 +4039,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.45/arc
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h	2011-08-18 23:19:30.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/spinlock_64.h	2011-08-18 23:19:30.000000000 -0400
 @@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -4139,9 +4139,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.45/
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h
---- linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h	2011-06-04 20:46:01.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h
+--- linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/thread_info_32.h	2011-06-04 20:46:01.000000000 -0400
 @@ -50,6 +50,8 @@ struct thread_info {
  	unsigned long		w_saved;
  
@@ -4151,9 +4151,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h linux-2.6.32.
  };
  
  /*
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h
---- linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h	2011-06-04 20:46:21.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h
+--- linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h	2011-06-04 20:46:21.000000000 -0400
 @@ -68,6 +68,8 @@ struct thread_info {
  	struct pt_regs		*kern_una_regs;
  	unsigned int		kern_una_insn;
@@ -4163,9 +4163,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.
  	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -4217,9 +4217,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.45/a
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -4262,9 +4262,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.45/a
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess.h linux-2.6.32.45/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.45/arch/sparc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess.h linux-2.6.32.46/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/sparc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -4279,9 +4279,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess.h linux-2.6.32.45/arch
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/iommu.c linux-2.6.32.45/arch/sparc/kernel/iommu.c
---- linux-2.6.32.45/arch/sparc/kernel/iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/iommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/iommu.c linux-2.6.32.46/arch/sparc/kernel/iommu.c
+--- linux-2.6.32.46/arch/sparc/kernel/iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/iommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -4300,9 +4300,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/iommu.c linux-2.6.32.45/arch/sparc/
  EXPORT_SYMBOL(dma_ops);
  
  extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/ioport.c linux-2.6.32.45/arch/sparc/kernel/ioport.c
---- linux-2.6.32.45/arch/sparc/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/ioport.c linux-2.6.32.46/arch/sparc/kernel/ioport.c
+--- linux-2.6.32.46/arch/sparc/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
  	BUG();
  }
@@ -4330,9 +4330,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/ioport.c linux-2.6.32.45/arch/sparc
  	.alloc_coherent		= pci32_alloc_coherent,
  	.free_coherent		= pci32_free_coherent,
  	.map_page		= pci32_map_page,
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/kgdb_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -4342,9 +4342,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c linux-2.6.32.45/arch/spar
  	/* Breakpoint instruction: ta 0x7d */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x7d },
  };
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
  {
  }
@@ -4354,9 +4354,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c linux-2.6.32.45/arch/spar
  	/* Breakpoint instruction: ta 0x72 */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/Makefile linux-2.6.32.45/arch/sparc/kernel/Makefile
---- linux-2.6.32.45/arch/sparc/kernel/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/Makefile linux-2.6.32.46/arch/sparc/kernel/Makefile
+--- linux-2.6.32.46/arch/sparc/kernel/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -4366,9 +4366,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/Makefile linux-2.6.32.45/arch/sparc
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c	2011-04-17 15:56:46.000000000 -0400
 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
  	spin_unlock_irqrestore(&iommu->lock, flags);
  }
@@ -4378,9 +4378,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.45/arch/sp
  	.alloc_coherent			= dma_4v_alloc_coherent,
  	.free_coherent			= dma_4v_free_coherent,
  	.map_page			= dma_4v_map_page,
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/process_32.c linux-2.6.32.45/arch/sparc/kernel/process_32.c
---- linux-2.6.32.45/arch/sparc/kernel/process_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/process_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_32.c linux-2.6.32.46/arch/sparc/kernel/process_32.c
+--- linux-2.6.32.46/arch/sparc/kernel/process_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/process_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
@@ -4416,9 +4416,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/process_32.c linux-2.6.32.45/arch/s
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/process_64.c linux-2.6.32.45/arch/sparc/kernel/process_64.c
---- linux-2.6.32.45/arch/sparc/kernel/process_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/process_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/process_64.c linux-2.6.32.46/arch/sparc/kernel/process_64.c
+--- linux-2.6.32.46/arch/sparc/kernel/process_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/process_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
  	printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
  	       rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -4454,9 +4454,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/process_64.c linux-2.6.32.45/arch/s
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/sys_sparc_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
@@ -4475,9 +4475,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.45/arch
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/sys_sparc_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
@@ -4625,9 +4625,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.45/arch
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/traps_32.c linux-2.6.32.45/arch/sparc/kernel/traps_32.c
---- linux-2.6.32.45/arch/sparc/kernel/traps_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/traps_32.c	2011-06-13 21:25:39.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_32.c linux-2.6.32.46/arch/sparc/kernel/traps_32.c
+--- linux-2.6.32.46/arch/sparc/kernel/traps_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/traps_32.c	2011-06-13 21:25:39.000000000 -0400
 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
  #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
  #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -4657,9 +4657,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/traps_32.c linux-2.6.32.45/arch/spa
  	do_exit(SIGSEGV);
  }
  
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/traps_64.c linux-2.6.32.45/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.45/arch/sparc/kernel/traps_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/traps_64.c	2011-06-13 21:24:11.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/traps_64.c linux-2.6.32.46/arch/sparc/kernel/traps_64.c
+--- linux-2.6.32.46/arch/sparc/kernel/traps_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/traps_64.c	2011-06-13 21:24:11.000000000 -0400
 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_
  		       i + 1,
  		       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -4791,9 +4791,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/traps_64.c linux-2.6.32.45/arch/spa
  	do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S
---- linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S	2011-07-13 22:20:05.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S
+--- linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/una_asm_64.S	2011-07-13 22:20:05.000000000 -0400
 @@ -127,7 +127,7 @@ do_int_load:
  	wr	%o5, 0x0, %asi
  	retl
@@ -4803,9 +4803,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S linux-2.6.32.45/arch/s
  
  	.section	__ex_table,"a"
  	.word		4b, __retl_efault
-diff -urNp linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c
---- linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c
+--- linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs
  	if (count < 5) {
  		last_time = jiffies;
@@ -4815,9 +4815,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c linux-2.6.32.45/arch
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-2.6.32.45/arch/sparc/lib/atomic_64.S linux-2.6.32.45/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.45/arch/sparc/lib/atomic_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/lib/atomic_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/lib/atomic_64.S linux-2.6.32.46/arch/sparc/lib/atomic_64.S
+--- linux-2.6.32.46/arch/sparc/lib/atomic_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/lib/atomic_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -5052,9 +5052,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/lib/atomic_64.S linux-2.6.32.45/arch/sparc
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, 2f
-diff -urNp linux-2.6.32.45/arch/sparc/lib/ksyms.c linux-2.6.32.45/arch/sparc/lib/ksyms.c
---- linux-2.6.32.45/arch/sparc/lib/ksyms.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/lib/ksyms.c	2011-08-19 23:05:14.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/lib/ksyms.c linux-2.6.32.46/arch/sparc/lib/ksyms.c
+--- linux-2.6.32.46/arch/sparc/lib/ksyms.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/lib/ksyms.c	2011-08-19 23:05:14.000000000 -0400
 @@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -5074,9 +5074,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/lib/ksyms.c linux-2.6.32.45/arch/sparc/lib
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-2.6.32.45/arch/sparc/lib/Makefile linux-2.6.32.45/arch/sparc/lib/Makefile
---- linux-2.6.32.45/arch/sparc/lib/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/lib/Makefile	2011-05-17 19:26:34.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/lib/Makefile linux-2.6.32.46/arch/sparc/lib/Makefile
+--- linux-2.6.32.46/arch/sparc/lib/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/lib/Makefile	2011-05-17 19:26:34.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -5086,9 +5086,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/lib/Makefile linux-2.6.32.45/arch/sparc/li
  
  lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
  lib-$(CONFIG_SPARC32) += memcpy.o memset.o
-diff -urNp linux-2.6.32.45/arch/sparc/lib/rwsem_64.S linux-2.6.32.45/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.45/arch/sparc/lib/rwsem_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/lib/rwsem_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/lib/rwsem_64.S linux-2.6.32.46/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.32.46/arch/sparc/lib/rwsem_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/lib/rwsem_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -11,7 +11,12 @@
  	.globl		__down_read
  __down_read:
@@ -5187,9 +5187,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/lib/rwsem_64.S linux-2.6.32.45/arch/sparc/
  	cas		[%o0], %g3, %g7
  	cmp		%g3, %g7
  	bne,pn		%icc, 1b
-diff -urNp linux-2.6.32.45/arch/sparc/Makefile linux-2.6.32.45/arch/sparc/Makefile
---- linux-2.6.32.45/arch/sparc/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/Makefile linux-2.6.32.46/arch/sparc/Makefile
+--- linux-2.6.32.46/arch/sparc/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -5199,9 +5199,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/Makefile linux-2.6.32.45/arch/sparc/Makefi
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-2.6.32.45/arch/sparc/mm/fault_32.c linux-2.6.32.45/arch/sparc/mm/fault_32.c
---- linux-2.6.32.45/arch/sparc/mm/fault_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/mm/fault_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_32.c linux-2.6.32.46/arch/sparc/mm/fault_32.c
+--- linux-2.6.32.46/arch/sparc/mm/fault_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/fault_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -5505,9 +5505,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/mm/fault_32.c linux-2.6.32.45/arch/sparc/m
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-2.6.32.45/arch/sparc/mm/fault_64.c linux-2.6.32.45/arch/sparc/mm/fault_64.c
---- linux-2.6.32.45/arch/sparc/mm/fault_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/mm/fault_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_64.c linux-2.6.32.46/arch/sparc/mm/fault_64.c
+--- linux-2.6.32.46/arch/sparc/mm/fault_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/fault_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -20,6 +20,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -6014,9 +6014,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/mm/fault_64.c linux-2.6.32.45/arch/sparc/m
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
 @@ -69,7 +69,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -6076,9 +6076,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c linux-2.6.32.45/arch/spar
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.32.45/arch/sparc/mm/init_32.c linux-2.6.32.45/arch/sparc/mm/init_32.c
---- linux-2.6.32.45/arch/sparc/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/mm/init_32.c linux-2.6.32.46/arch/sparc/mm/init_32.c
+--- linux-2.6.32.46/arch/sparc/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -317,6 +317,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -6113,9 +6113,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/mm/init_32.c linux-2.6.32.45/arch/sparc/mm
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.45/arch/sparc/mm/Makefile linux-2.6.32.45/arch/sparc/mm/Makefile
---- linux-2.6.32.45/arch/sparc/mm/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/mm/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/mm/Makefile linux-2.6.32.46/arch/sparc/mm/Makefile
+--- linux-2.6.32.46/arch/sparc/mm/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -6125,9 +6125,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/mm/Makefile linux-2.6.32.45/arch/sparc/mm/
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-2.6.32.45/arch/sparc/mm/srmmu.c linux-2.6.32.45/arch/sparc/mm/srmmu.c
---- linux-2.6.32.45/arch/sparc/mm/srmmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/sparc/mm/srmmu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/sparc/mm/srmmu.c linux-2.6.32.46/arch/sparc/mm/srmmu.c
+--- linux-2.6.32.46/arch/sparc/mm/srmmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/srmmu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -6142,9 +6142,9 @@ diff -urNp linux-2.6.32.45/arch/sparc/mm/srmmu.c linux-2.6.32.45/arch/sparc/mm/s
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-2.6.32.45/arch/um/include/asm/kmap_types.h linux-2.6.32.45/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.45/arch/um/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/um/include/asm/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/um/include/asm/kmap_types.h linux-2.6.32.46/arch/um/include/asm/kmap_types.h
+--- linux-2.6.32.46/arch/um/include/asm/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/um/include/asm/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -6153,9 +6153,9 @@ diff -urNp linux-2.6.32.45/arch/um/include/asm/kmap_types.h linux-2.6.32.45/arch
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.45/arch/um/include/asm/page.h linux-2.6.32.45/arch/um/include/asm/page.h
---- linux-2.6.32.45/arch/um/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/um/include/asm/page.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/um/include/asm/page.h linux-2.6.32.46/arch/um/include/asm/page.h
+--- linux-2.6.32.46/arch/um/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/um/include/asm/page.h	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -6166,9 +6166,9 @@ diff -urNp linux-2.6.32.45/arch/um/include/asm/page.h linux-2.6.32.45/arch/um/in
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-2.6.32.45/arch/um/kernel/process.c linux-2.6.32.45/arch/um/kernel/process.c
---- linux-2.6.32.45/arch/um/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/um/kernel/process.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/um/kernel/process.c linux-2.6.32.46/arch/um/kernel/process.c
+--- linux-2.6.32.46/arch/um/kernel/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/um/kernel/process.c	2011-04-17 15:56:46.000000000 -0400
 @@ -393,22 +393,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -6192,9 +6192,9 @@ diff -urNp linux-2.6.32.45/arch/um/kernel/process.c linux-2.6.32.45/arch/um/kern
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-2.6.32.45/arch/um/sys-i386/syscalls.c linux-2.6.32.45/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.45/arch/um/sys-i386/syscalls.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/um/sys-i386/syscalls.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/um/sys-i386/syscalls.c linux-2.6.32.46/arch/um/sys-i386/syscalls.c
+--- linux-2.6.32.46/arch/um/sys-i386/syscalls.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/um/sys-i386/syscalls.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -6217,9 +6217,9 @@ diff -urNp linux-2.6.32.45/arch/um/sys-i386/syscalls.c linux-2.6.32.45/arch/um/s
  /*
   * Perform the select(nd, in, out, ex, tv) and mmap() system
   * calls. Linux/i386 didn't use to be able to handle more than
-diff -urNp linux-2.6.32.45/arch/x86/boot/bitops.h linux-2.6.32.45/arch/x86/boot/bitops.h
---- linux-2.6.32.45/arch/x86/boot/bitops.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/bitops.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/bitops.h linux-2.6.32.46/arch/x86/boot/bitops.h
+--- linux-2.6.32.46/arch/x86/boot/bitops.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/bitops.h	2011-04-17 15:56:46.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
@@ -6238,9 +6238,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/bitops.h linux-2.6.32.45/arch/x86/boot/
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.32.45/arch/x86/boot/boot.h linux-2.6.32.45/arch/x86/boot/boot.h
---- linux-2.6.32.45/arch/x86/boot/boot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/boot.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/boot.h linux-2.6.32.46/arch/x86/boot/boot.h
+--- linux-2.6.32.46/arch/x86/boot/boot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/boot.h	2011-04-17 15:56:46.000000000 -0400
 @@ -82,7 +82,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -6259,9 +6259,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/boot.h linux-2.6.32.45/arch/x86/boot/bo
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/head_32.S linux-2.6.32.45/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.45/arch/x86/boot/compressed/head_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/compressed/head_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_32.S linux-2.6.32.46/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.32.46/arch/x86/boot/compressed/head_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/head_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -6290,9 +6290,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/head_32.S linux-2.6.32.45/ar
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/head_64.S linux-2.6.32.45/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.45/arch/x86/boot/compressed/head_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/compressed/head_64.S	2011-07-01 18:53:00.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_64.S linux-2.6.32.46/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.32.46/arch/x86/boot/compressed/head_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/head_64.S	2011-07-01 18:53:00.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -6320,9 +6320,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/head_64.S linux-2.6.32.45/ar
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/Makefile linux-2.6.32.45/arch/x86/boot/compressed/Makefile
---- linux-2.6.32.45/arch/x86/boot/compressed/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/compressed/Makefile	2011-08-07 14:38:34.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/Makefile linux-2.6.32.46/arch/x86/boot/compressed/Makefile
+--- linux-2.6.32.46/arch/x86/boot/compressed/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/Makefile	2011-08-07 14:38:34.000000000 -0400
 @@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
  KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -6333,9 +6333,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/Makefile linux-2.6.32.45/arc
  
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
-diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/misc.c linux-2.6.32.45/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.45/arch/x86/boot/compressed/misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/compressed/misc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/misc.c linux-2.6.32.46/arch/x86/boot/compressed/misc.c
+--- linux-2.6.32.46/arch/x86/boot/compressed/misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/misc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -288,7 +288,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -6354,9 +6354,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/misc.c linux-2.6.32.45/arch/
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/mkpiggy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
  
  	offs = (olen > ilen) ? olen - ilen : 0;
@@ -6366,9 +6366,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.45/ar
  	offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
  
  	printf(".section \".rodata.compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/relocs.c linux-2.6.32.45/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.45/arch/x86/boot/compressed/relocs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/compressed/relocs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/relocs.c linux-2.6.32.46/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.32.46/arch/x86/boot/compressed/relocs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/relocs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -10,8 +10,11 @@
  #define USE_BSD
  #include <endian.h>
@@ -6569,9 +6569,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/relocs.c linux-2.6.32.45/arc
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-2.6.32.45/arch/x86/boot/cpucheck.c linux-2.6.32.45/arch/x86/boot/cpucheck.c
---- linux-2.6.32.45/arch/x86/boot/cpucheck.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/cpucheck.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/cpucheck.c linux-2.6.32.46/arch/x86/boot/cpucheck.c
+--- linux-2.6.32.46/arch/x86/boot/cpucheck.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/cpucheck.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -6667,9 +6667,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/cpucheck.c linux-2.6.32.45/arch/x86/boo
  
  		err = check_flags();
  	}
-diff -urNp linux-2.6.32.45/arch/x86/boot/header.S linux-2.6.32.45/arch/x86/boot/header.S
---- linux-2.6.32.45/arch/x86/boot/header.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/header.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/header.S linux-2.6.32.46/arch/x86/boot/header.S
+--- linux-2.6.32.46/arch/x86/boot/header.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/header.S	2011-04-17 15:56:46.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
@@ -6679,9 +6679,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/header.S linux-2.6.32.45/arch/x86/boot/
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-2.6.32.45/arch/x86/boot/Makefile linux-2.6.32.45/arch/x86/boot/Makefile
---- linux-2.6.32.45/arch/x86/boot/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/Makefile	2011-08-07 14:38:13.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/Makefile linux-2.6.32.46/arch/x86/boot/Makefile
+--- linux-2.6.32.46/arch/x86/boot/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/Makefile	2011-08-07 14:38:13.000000000 -0400
 @@ -69,6 +69,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -6692,9 +6692,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/Makefile linux-2.6.32.45/arch/x86/boot/
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-2.6.32.45/arch/x86/boot/memory.c linux-2.6.32.45/arch/x86/boot/memory.c
---- linux-2.6.32.45/arch/x86/boot/memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/memory.c linux-2.6.32.46/arch/x86/boot/memory.c
+--- linux-2.6.32.46/arch/x86/boot/memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -6704,9 +6704,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/memory.c linux-2.6.32.45/arch/x86/boot/
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.32.45/arch/x86/boot/video.c linux-2.6.32.45/arch/x86/boot/video.c
---- linux-2.6.32.45/arch/x86/boot/video.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/video.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/video.c linux-2.6.32.46/arch/x86/boot/video.c
+--- linux-2.6.32.46/arch/x86/boot/video.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/video.c	2011-04-17 15:56:46.000000000 -0400
 @@ -90,7 +90,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -6716,9 +6716,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/video.c linux-2.6.32.45/arch/x86/boot/v
  	int key;
  	unsigned int v;
  
-diff -urNp linux-2.6.32.45/arch/x86/boot/video-vesa.c linux-2.6.32.45/arch/x86/boot/video-vesa.c
---- linux-2.6.32.45/arch/x86/boot/video-vesa.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/boot/video-vesa.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/boot/video-vesa.c linux-2.6.32.46/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.46/arch/x86/boot/video-vesa.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/video-vesa.c	2011-04-17 15:56:46.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
  	boot_params.screen_info.vesapm_seg = oreg.es;
@@ -6727,9 +6727,9 @@ diff -urNp linux-2.6.32.45/arch/x86/boot/video-vesa.c linux-2.6.32.45/arch/x86/b
  }
  
  /*
-diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32_aout.c linux-2.6.32.45/arch/x86/ia32/ia32_aout.c
---- linux-2.6.32.45/arch/x86/ia32/ia32_aout.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/ia32/ia32_aout.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_aout.c linux-2.6.32.46/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.32.46/arch/x86/ia32/ia32_aout.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/ia32/ia32_aout.c	2011-04-17 15:56:46.000000000 -0400
 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
@@ -6752,9 +6752,9 @@ diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32_aout.c linux-2.6.32.45/arch/x86/ia
  end_coredump:
  	set_fs(fs);
  	return has_dumped;
-diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32entry.S linux-2.6.32.45/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.45/arch/x86/ia32/ia32entry.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/ia32/ia32entry.S	2011-08-25 17:42:18.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32entry.S linux-2.6.32.46/arch/x86/ia32/ia32entry.S
+--- linux-2.6.32.46/arch/x86/ia32/ia32entry.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/ia32/ia32entry.S	2011-08-25 17:42:18.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -6931,9 +6931,9 @@ diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32entry.S linux-2.6.32.45/arch/x86/ia
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32_signal.c linux-2.6.32.45/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.45/arch/x86/ia32/ia32_signal.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/ia32/ia32_signal.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_signal.c linux-2.6.32.46/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.46/arch/x86/ia32/ia32_signal.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/ia32/ia32_signal.c	2011-04-17 15:56:46.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
  	sp -= frame_size;
  	/* Align the stack pointer according to the i386 ABI,
@@ -6983,9 +6983,9 @@ diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32_signal.c linux-2.6.32.45/arch/x86/
  	} put_user_catch(err);
  
  	if (err)
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/alternative.h linux-2.6.32.45/arch/x86/include/asm/alternative.h
---- linux-2.6.32.45/arch/x86/include/asm/alternative.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/alternative.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/alternative.h linux-2.6.32.46/arch/x86/include/asm/alternative.h
+--- linux-2.6.32.46/arch/x86/include/asm/alternative.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/alternative.h	2011-04-17 15:56:46.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
        "	 .byte 662b-661b\n"			/* sourcelen       */	\
        "	 .byte 664f-663f\n"			/* replacementlen  */	\
@@ -6995,9 +6995,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/alternative.h linux-2.6.32.45/ar
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/apic.h linux-2.6.32.45/arch/x86/include/asm/apic.h
---- linux-2.6.32.45/arch/x86/include/asm/apic.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/apic.h	2011-08-17 20:01:15.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/apic.h linux-2.6.32.46/arch/x86/include/asm/apic.h
+--- linux-2.6.32.46/arch/x86/include/asm/apic.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/apic.h	2011-08-17 20:01:15.000000000 -0400
 @@ -46,7 +46,7 @@ static inline void generic_apic_probe(vo
  
  #ifdef CONFIG_X86_LOCAL_APIC
@@ -7007,9 +7007,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/apic.h linux-2.6.32.45/arch/x86/
  extern int local_apic_timer_c2_ok;
  
  extern int disable_apic;
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/apm.h linux-2.6.32.45/arch/x86/include/asm/apm.h
---- linux-2.6.32.45/arch/x86/include/asm/apm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/apm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/apm.h linux-2.6.32.46/arch/x86/include/asm/apm.h
+--- linux-2.6.32.46/arch/x86/include/asm/apm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/apm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -7028,9 +7028,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/apm.h linux-2.6.32.45/arch/x86/i
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/atomic_32.h linux-2.6.32.45/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.45/arch/x86/include/asm/atomic_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/atomic_32.h	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_32.h linux-2.6.32.46/arch/x86/include/asm/atomic_32.h
+--- linux-2.6.32.46/arch/x86/include/asm/atomic_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/atomic_32.h	2011-05-04 17:56:20.000000000 -0400
 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom
  }
  
@@ -7544,9 +7544,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/atomic_32.h linux-2.6.32.45/arch
   * atomic64_dec_and_test - decrement and test
   * @ptr: pointer to type atomic64_t
   *
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/atomic_64.h linux-2.6.32.45/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.45/arch/x86/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/atomic_64.h	2011-05-04 18:35:31.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/atomic_64.h linux-2.6.32.46/arch/x86/include/asm/atomic_64.h
+--- linux-2.6.32.46/arch/x86/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/atomic_64.h	2011-05-04 18:35:31.000000000 -0400
 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom
  }
  
@@ -8211,9 +8211,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/atomic_64.h linux-2.6.32.45/arch
  }
  
  /**
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/bitops.h linux-2.6.32.45/arch/x86/include/asm/bitops.h
---- linux-2.6.32.45/arch/x86/include/asm/bitops.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/bitops.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/bitops.h linux-2.6.32.46/arch/x86/include/asm/bitops.h
+--- linux-2.6.32.46/arch/x86/include/asm/bitops.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/bitops.h	2011-04-17 15:56:46.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -8223,9 +8223,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/bitops.h linux-2.6.32.45/arch/x8
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/boot.h linux-2.6.32.45/arch/x86/include/asm/boot.h
---- linux-2.6.32.45/arch/x86/include/asm/boot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/boot.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/boot.h linux-2.6.32.46/arch/x86/include/asm/boot.h
+--- linux-2.6.32.46/arch/x86/include/asm/boot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/boot.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -8243,9 +8243,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/boot.h linux-2.6.32.45/arch/x86/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/cacheflush.h linux-2.6.32.45/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.45/arch/x86/include/asm/cacheflush.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/cacheflush.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/cacheflush.h linux-2.6.32.46/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.32.46/arch/x86/include/asm/cacheflush.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/cacheflush.h	2011-04-17 15:56:46.000000000 -0400
 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
  static inline unsigned long get_page_memtype(struct page *pg)
  {
@@ -8264,9 +8264,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/cacheflush.h linux-2.6.32.45/arc
  		ClearPageUncached(pg);
  		ClearPageWC(pg);
  		break;
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/cache.h linux-2.6.32.45/arch/x86/include/asm/cache.h
---- linux-2.6.32.45/arch/x86/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/cache.h	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/cache.h linux-2.6.32.46/arch/x86/include/asm/cache.h
+--- linux-2.6.32.46/arch/x86/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/cache.h	2011-07-06 19:53:33.000000000 -0400
 @@ -5,9 +5,10 @@
  
  /* L1 cache line size */
@@ -8279,9 +8279,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/cache.h linux-2.6.32.45/arch/x86
  
  #ifdef CONFIG_X86_VSMP
  /* vSMP Internode cacheline shift */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/checksum_32.h linux-2.6.32.45/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.45/arch/x86/include/asm/checksum_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/checksum_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/checksum_32.h linux-2.6.32.46/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.32.46/arch/x86/include/asm/checksum_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/checksum_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
@@ -8315,9 +8315,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/checksum_32.h linux-2.6.32.45/ar
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/desc_defs.h linux-2.6.32.45/arch/x86/include/asm/desc_defs.h
---- linux-2.6.32.45/arch/x86/include/asm/desc_defs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/desc_defs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc_defs.h linux-2.6.32.46/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.32.46/arch/x86/include/asm/desc_defs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/desc_defs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -31,6 +31,12 @@ struct desc_struct {
  			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
  			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -8331,9 +8331,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/desc_defs.h linux-2.6.32.45/arch
  	};
  } __attribute__((packed));
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/desc.h linux-2.6.32.45/arch/x86/include/asm/desc.h
---- linux-2.6.32.45/arch/x86/include/asm/desc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/desc.h	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc.h linux-2.6.32.46/arch/x86/include/asm/desc.h
+--- linux-2.6.32.46/arch/x86/include/asm/desc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/desc.h	2011-04-23 12:56:10.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -8514,9 +8514,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/desc.h linux-2.6.32.45/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/device.h linux-2.6.32.45/arch/x86/include/asm/device.h
---- linux-2.6.32.45/arch/x86/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/device.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/device.h linux-2.6.32.46/arch/x86/include/asm/device.h
+--- linux-2.6.32.46/arch/x86/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/device.h	2011-04-17 15:56:46.000000000 -0400
 @@ -6,7 +6,7 @@ struct dev_archdata {
  	void	*acpi_handle;
  #endif
@@ -8526,9 +8526,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/device.h linux-2.6.32.45/arch/x8
  #endif
  #ifdef CONFIG_DMAR
  	void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/dma-mapping.h	2011-04-17 15:56:46.000000000 -0400
 @@ -25,9 +25,9 @@ extern int iommu_merge;
  extern struct device x86_dma_fallback_dev;
  extern int panic_on_overflow;
@@ -8568,9 +8568,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h linux-2.6.32.45/ar
  
  	WARN_ON(irqs_disabled());       /* for portability */
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/e820.h linux-2.6.32.45/arch/x86/include/asm/e820.h
---- linux-2.6.32.45/arch/x86/include/asm/e820.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/e820.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/e820.h linux-2.6.32.46/arch/x86/include/asm/e820.h
+--- linux-2.6.32.46/arch/x86/include/asm/e820.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/e820.h	2011-04-17 15:56:46.000000000 -0400
 @@ -133,7 +133,7 @@ extern char *default_machine_specific_me
  #define ISA_END_ADDRESS		0x100000
  #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -8580,9 +8580,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/e820.h linux-2.6.32.45/arch/x86/
  #define BIOS_END		0x00100000
  
  #ifdef __KERNEL__
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/elf.h linux-2.6.32.45/arch/x86/include/asm/elf.h
---- linux-2.6.32.45/arch/x86/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/elf.h	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/elf.h linux-2.6.32.46/arch/x86/include/asm/elf.h
+--- linux-2.6.32.46/arch/x86/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/elf.h	2011-08-23 20:24:19.000000000 -0400
 @@ -257,7 +257,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -8637,9 +8637,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/elf.h linux-2.6.32.45/arch/x86/i
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h
---- linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h	2011-05-22 23:02:06.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h
+--- linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/emergency-restart.h	2011-05-22 23:02:06.000000000 -0400
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -8648,9 +8648,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h linux-2.6.32
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/futex.h linux-2.6.32.45/arch/x86/include/asm/futex.h
---- linux-2.6.32.45/arch/x86/include/asm/futex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/futex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/futex.h linux-2.6.32.46/arch/x86/include/asm/futex.h
+--- linux-2.6.32.46/arch/x86/include/asm/futex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/futex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -8726,9 +8726,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/futex.h linux-2.6.32.45/arch/x86
  		     : "i" (-EFAULT), "r" (newval), "0" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/hw_irq.h linux-2.6.32.45/arch/x86/include/asm/hw_irq.h
---- linux-2.6.32.45/arch/x86/include/asm/hw_irq.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/hw_irq.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/hw_irq.h linux-2.6.32.46/arch/x86/include/asm/hw_irq.h
+--- linux-2.6.32.46/arch/x86/include/asm/hw_irq.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/hw_irq.h	2011-05-04 17:56:28.000000000 -0400
 @@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
@@ -8740,9 +8740,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/hw_irq.h linux-2.6.32.45/arch/x8
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/i387.h linux-2.6.32.45/arch/x86/include/asm/i387.h
---- linux-2.6.32.45/arch/x86/include/asm/i387.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/i387.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/i387.h linux-2.6.32.46/arch/x86/include/asm/i387.h
+--- linux-2.6.32.46/arch/x86/include/asm/i387.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/i387.h	2011-04-17 15:56:46.000000000 -0400
 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -8792,9 +8792,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/i387.h linux-2.6.32.45/arch/x86/
  	else
  		clts();
  }
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/io_32.h linux-2.6.32.45/arch/x86/include/asm/io_32.h
---- linux-2.6.32.45/arch/x86/include/asm/io_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/io_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_32.h linux-2.6.32.46/arch/x86/include/asm/io_32.h
+--- linux-2.6.32.46/arch/x86/include/asm/io_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/io_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -3,6 +3,7 @@
  
  #include <linux/string.h>
@@ -8821,9 +8821,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/io_32.h linux-2.6.32.45/arch/x86
  #include <asm-generic/iomap.h>
  
  #include <linux/vmalloc.h>
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/io_64.h linux-2.6.32.45/arch/x86/include/asm/io_64.h
---- linux-2.6.32.45/arch/x86/include/asm/io_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/io_64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/io_64.h linux-2.6.32.46/arch/x86/include/asm/io_64.h
+--- linux-2.6.32.46/arch/x86/include/asm/io_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/io_64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -140,6 +140,17 @@ __OUTS(l)
  
  #include <linux/vmalloc.h>
@@ -8842,9 +8842,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/io_64.h linux-2.6.32.45/arch/x86
  #include <asm-generic/iomap.h>
  
  void __memcpy_fromio(void *, unsigned long, unsigned);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/iommu.h linux-2.6.32.45/arch/x86/include/asm/iommu.h
---- linux-2.6.32.45/arch/x86/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/iommu.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/iommu.h linux-2.6.32.46/arch/x86/include/asm/iommu.h
+--- linux-2.6.32.46/arch/x86/include/asm/iommu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/iommu.h	2011-04-17 15:56:46.000000000 -0400
 @@ -3,7 +3,7 @@
  
  extern void pci_iommu_shutdown(void);
@@ -8854,9 +8854,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/iommu.h linux-2.6.32.45/arch/x86
  extern int force_iommu, no_iommu;
  extern int iommu_detected;
  extern int iommu_pass_through;
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/irqflags.h linux-2.6.32.45/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.45/arch/x86/include/asm/irqflags.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/irqflags.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/irqflags.h linux-2.6.32.46/arch/x86/include/asm/irqflags.h
+--- linux-2.6.32.46/arch/x86/include/asm/irqflags.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/irqflags.h	2011-04-17 15:56:46.000000000 -0400
 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
  	sti;					\
  	sysexit
@@ -8869,9 +8869,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/irqflags.h linux-2.6.32.45/arch/
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/kprobes.h linux-2.6.32.45/arch/x86/include/asm/kprobes.h
---- linux-2.6.32.45/arch/x86/include/asm/kprobes.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/kprobes.h	2011-04-23 12:56:12.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/kprobes.h linux-2.6.32.46/arch/x86/include/asm/kprobes.h
+--- linux-2.6.32.46/arch/x86/include/asm/kprobes.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/kprobes.h	2011-04-23 12:56:12.000000000 -0400
 @@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t;
  #define BREAKPOINT_INSTRUCTION	0xcc
  #define RELATIVEJUMP_INSTRUCTION 0xe9
@@ -8888,9 +8888,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/kprobes.h linux-2.6.32.45/arch/x
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/kvm_host.h linux-2.6.32.45/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.45/arch/x86/include/asm/kvm_host.h	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/kvm_host.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/kvm_host.h linux-2.6.32.46/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.32.46/arch/x86/include/asm/kvm_host.h	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/kvm_host.h	2011-08-26 20:19:09.000000000 -0400
 @@ -534,9 +534,9 @@ struct kvm_x86_ops {
  	bool (*gb_page_enable)(void);
  
@@ -8903,9 +8903,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/kvm_host.h linux-2.6.32.45/arch/
  
  int kvm_mmu_module_init(void);
  void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/local.h linux-2.6.32.45/arch/x86/include/asm/local.h
---- linux-2.6.32.45/arch/x86/include/asm/local.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/local.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/local.h linux-2.6.32.46/arch/x86/include/asm/local.h
+--- linux-2.6.32.46/arch/x86/include/asm/local.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/local.h	2011-04-17 15:56:46.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -9058,9 +9058,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/local.h linux-2.6.32.45/arch/x86
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/microcode.h linux-2.6.32.45/arch/x86/include/asm/microcode.h
---- linux-2.6.32.45/arch/x86/include/asm/microcode.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/microcode.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/microcode.h linux-2.6.32.46/arch/x86/include/asm/microcode.h
+--- linux-2.6.32.46/arch/x86/include/asm/microcode.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/microcode.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,13 +12,13 @@ struct device;
  enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
  
@@ -9101,9 +9101,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/microcode.h linux-2.6.32.45/arch
  {
  	return NULL;
  }
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/mman.h linux-2.6.32.45/arch/x86/include/asm/mman.h
---- linux-2.6.32.45/arch/x86/include/asm/mman.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/mman.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/mman.h linux-2.6.32.46/arch/x86/include/asm/mman.h
+--- linux-2.6.32.46/arch/x86/include/asm/mman.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/mman.h	2011-04-17 15:56:46.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -9119,9 +9119,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/mman.h linux-2.6.32.45/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/mmu_context.h linux-2.6.32.45/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.45/arch/x86/include/asm/mmu_context.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/mmu_context.h	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu_context.h linux-2.6.32.46/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.32.46/arch/x86/include/asm/mmu_context.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/mmu_context.h	2011-08-23 20:24:19.000000000 -0400
 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -9242,9 +9242,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/mmu_context.h linux-2.6.32.45/ar
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/mmu.h linux-2.6.32.45/arch/x86/include/asm/mmu.h
---- linux-2.6.32.45/arch/x86/include/asm/mmu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/mmu.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu.h linux-2.6.32.46/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.46/arch/x86/include/asm/mmu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/mmu.h	2011-04-17 15:56:46.000000000 -0400
 @@ -9,10 +9,23 @@
   * we put the segment information here.
   */
@@ -9271,9 +9271,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/mmu.h linux-2.6.32.45/arch/x86/i
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/module.h linux-2.6.32.45/arch/x86/include/asm/module.h
---- linux-2.6.32.45/arch/x86/include/asm/module.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/module.h	2011-04-23 13:18:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/module.h linux-2.6.32.46/arch/x86/include/asm/module.h
+--- linux-2.6.32.46/arch/x86/include/asm/module.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/module.h	2011-04-23 13:18:57.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -9326,9 +9326,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/module.h linux-2.6.32.45/arch/x8
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/page_64_types.h linux-2.6.32.45/arch/x86/include/asm/page_64_types.h
---- linux-2.6.32.45/arch/x86/include/asm/page_64_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/page_64_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/page_64_types.h linux-2.6.32.46/arch/x86/include/asm/page_64_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/page_64_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/page_64_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -9338,9 +9338,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/page_64_types.h linux-2.6.32.45/
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/paravirt.h linux-2.6.32.45/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.45/arch/x86/include/asm/paravirt.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/paravirt.h	2011-08-23 21:36:48.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt.h linux-2.6.32.46/arch/x86/include/asm/paravirt.h
+--- linux-2.6.32.46/arch/x86/include/asm/paravirt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/paravirt.h	2011-08-23 21:36:48.000000000 -0400
 @@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp, 
  			    val);
  }
@@ -9413,9 +9413,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/paravirt.h linux-2.6.32.45/arch/
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/paravirt_types.h	2011-08-23 20:24:19.000000000 -0400
 @@ -78,19 +78,19 @@ struct pv_init_ops {
  	 */
  	unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
@@ -9487,9 +9487,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h linux-2.6.32.45
  
  /* This contains all the paravirt structures: we get a convenient
   * number for each function using the offset which we use to indicate
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pci_x86.h linux-2.6.32.45/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.45/arch/x86/include/asm/pci_x86.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pci_x86.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pci_x86.h linux-2.6.32.46/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.32.46/arch/x86/include/asm/pci_x86.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pci_x86.h	2011-04-17 15:56:46.000000000 -0400
 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 
  extern void (*pcibios_disable_irq)(struct pci_dev *dev);
  
@@ -9512,9 +9512,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pci_x86.h linux-2.6.32.45/arch/x
  extern bool port_cf9_safe;
  
  /* arch_initcall level */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/percpu.h linux-2.6.32.45/arch/x86/include/asm/percpu.h
---- linux-2.6.32.45/arch/x86/include/asm/percpu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/percpu.h	2011-08-17 19:33:59.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/percpu.h linux-2.6.32.46/arch/x86/include/asm/percpu.h
+--- linux-2.6.32.46/arch/x86/include/asm/percpu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/percpu.h	2011-08-17 19:33:59.000000000 -0400
 @@ -78,6 +78,7 @@ do {							\
  	if (0) {					\
  		T__ tmp__;				\
@@ -9523,9 +9523,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/percpu.h linux-2.6.32.45/arch/x8
  	}						\
  	switch (sizeof(var)) {				\
  	case 1:						\
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgalloc.h linux-2.6.32.45/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.45/arch/x86/include/asm/pgalloc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgalloc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgalloc.h linux-2.6.32.46/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgalloc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgalloc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
  				       pmd_t *pmd, pte_t *pte)
  {
@@ -9540,9 +9540,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgalloc.h linux-2.6.32.45/arch/x
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -9553,9 +9553,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.45
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
 @@ -26,9 +26,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -9599,9 +9599,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h linux-2.6.32.45/arc
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -9631,9 +9631,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.
  #define MODULES_VADDR	VMALLOC_START
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h	2011-04-17 15:56:46.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -9651,9 +9651,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.45
  }
  
  /*
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h	2011-08-23 20:24:19.000000000 -0400
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -9694,9 +9694,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h linux-2.6.32.45/arc
  	*pgdp = pgd;
  }
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -9708,9 +9708,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.
 +#define ktva_ktla(addr)		(addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable.h linux-2.6.32.45/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable.h	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable.h linux-2.6.32.46/arch/x86/include/asm/pgtable.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable.h	2011-08-23 20:24:19.000000000 -0400
 @@ -39,6 +39,7 @@ extern struct list_head pgd_list;
  
  #ifndef __PAGETABLE_PUD_FOLDED
@@ -9888,9 +9888,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable.h linux-2.6.32.45/arch/x
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -16,12 +16,11 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -10011,9 +10011,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h linux-2.6.32.45/
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/processor.h linux-2.6.32.45/arch/x86/include/asm/processor.h
---- linux-2.6.32.45/arch/x86/include/asm/processor.h	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/processor.h	2011-05-11 18:25:15.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/processor.h linux-2.6.32.46/arch/x86/include/asm/processor.h
+--- linux-2.6.32.46/arch/x86/include/asm/processor.h	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/processor.h	2011-05-11 18:25:15.000000000 -0400
 @@ -272,7 +272,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -10116,9 +10116,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/processor.h linux-2.6.32.45/arch
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/ptrace.h linux-2.6.32.45/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.45/arch/x86/include/asm/ptrace.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/ptrace.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/ptrace.h linux-2.6.32.46/arch/x86/include/asm/ptrace.h
+--- linux-2.6.32.46/arch/x86/include/asm/ptrace.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/ptrace.h	2011-04-17 15:56:46.000000000 -0400
 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_
  }
  
@@ -10155,9 +10155,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/ptrace.h linux-2.6.32.45/arch/x8
  #endif
  }
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/reboot.h linux-2.6.32.45/arch/x86/include/asm/reboot.h
---- linux-2.6.32.45/arch/x86/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/reboot.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/reboot.h linux-2.6.32.46/arch/x86/include/asm/reboot.h
+--- linux-2.6.32.46/arch/x86/include/asm/reboot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/reboot.h	2011-08-05 20:33:55.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -10184,9 +10184,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/reboot.h linux-2.6.32.45/arch/x8
  
  typedef void (*nmi_shootdown_cb)(int, struct die_args*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/rwsem.h linux-2.6.32.45/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.45/arch/x86/include/asm/rwsem.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/rwsem.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/rwsem.h linux-2.6.32.46/arch/x86/include/asm/rwsem.h
+--- linux-2.6.32.46/arch/x86/include/asm/rwsem.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/rwsem.h	2011-04-17 15:56:46.000000000 -0400
 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
@@ -10311,9 +10311,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/rwsem.h linux-2.6.32.45/arch/x86
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/segment.h linux-2.6.32.45/arch/x86/include/asm/segment.h
---- linux-2.6.32.45/arch/x86/include/asm/segment.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/segment.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/segment.h linux-2.6.32.46/arch/x86/include/asm/segment.h
+--- linux-2.6.32.46/arch/x86/include/asm/segment.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/segment.h	2011-04-17 15:56:46.000000000 -0400
 @@ -62,8 +62,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -10382,9 +10382,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/segment.h linux-2.6.32.45/arch/x
  #define __KERNEL_DS	(GDT_ENTRY_KERNEL_DS * 8)
  #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
  #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/smp.h linux-2.6.32.45/arch/x86/include/asm/smp.h
---- linux-2.6.32.45/arch/x86/include/asm/smp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/smp.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/smp.h linux-2.6.32.46/arch/x86/include/asm/smp.h
+--- linux-2.6.32.46/arch/x86/include/asm/smp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/smp.h	2011-08-05 20:33:55.000000000 -0400
 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
  DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
  DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -10432,9 +10432,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/smp.h linux-2.6.32.45/arch/x86/i
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/spinlock.h linux-2.6.32.45/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.45/arch/x86/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/spinlock.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/spinlock.h linux-2.6.32.46/arch/x86/include/asm/spinlock.h
+--- linux-2.6.32.46/arch/x86/include/asm/spinlock.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/spinlock.h	2011-04-17 15:56:46.000000000 -0400
 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r
  static inline void __raw_read_lock(raw_rwlock_t *rw)
  {
@@ -10497,9 +10497,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/spinlock.h linux-2.6.32.45/arch/
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/stackprotector.h linux-2.6.32.45/arch/x86/include/asm/stackprotector.h
---- linux-2.6.32.45/arch/x86/include/asm/stackprotector.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/stackprotector.h	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/stackprotector.h linux-2.6.32.46/arch/x86/include/asm/stackprotector.h
+--- linux-2.6.32.46/arch/x86/include/asm/stackprotector.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/stackprotector.h	2011-07-06 19:53:33.000000000 -0400
 @@ -48,7 +48,7 @@
   * head_32 for boot CPU and setup_per_cpu_areas() for others.
   */
@@ -10518,9 +10518,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/stackprotector.h linux-2.6.32.45
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/system.h linux-2.6.32.45/arch/x86/include/asm/system.h
---- linux-2.6.32.45/arch/x86/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/system.h	2011-05-22 23:02:03.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/system.h linux-2.6.32.46/arch/x86/include/asm/system.h
+--- linux-2.6.32.46/arch/x86/include/asm/system.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/system.h	2011-05-22 23:02:03.000000000 -0400
 @@ -132,7 +132,7 @@ do {									\
  	     "thread_return:\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
@@ -10563,9 +10563,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/system.h linux-2.6.32.45/arch/x8
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/thread_info.h linux-2.6.32.45/arch/x86/include/asm/thread_info.h
---- linux-2.6.32.45/arch/x86/include/asm/thread_info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/thread_info.h	2011-05-17 19:26:34.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/thread_info.h linux-2.6.32.46/arch/x86/include/asm/thread_info.h
+--- linux-2.6.32.46/arch/x86/include/asm/thread_info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/thread_info.h	2011-05-17 19:26:34.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -10713,9 +10713,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/thread_info.h linux-2.6.32.45/ar
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h	2011-05-16 21:46:57.000000000 -0400
 @@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_u
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -10856,9 +10856,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h linux-2.6.32.45/arc
  long __must_check strncpy_from_user(char *dst, const char __user *src,
  				    long count);
  long __must_check __strncpy_from_user(char *dst,
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h	2011-05-16 21:46:57.000000000 -0400
 @@ -9,6 +9,9 @@
  #include <linux/prefetch.h>
  #include <linux/lockdep.h>
@@ -11236,9 +11236,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h linux-2.6.32.45/arc
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess.h linux-2.6.32.45/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.45/arch/x86/include/asm/uaccess.h	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/uaccess.h	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess.h linux-2.6.32.46/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/x86/include/asm/uaccess.h	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/uaccess.h	2011-06-25 12:56:37.000000000 -0400
 @@ -8,12 +8,15 @@
  #include <linux/thread_info.h>
  #include <linux/prefetch.h>
@@ -11457,9 +11457,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess.h linux-2.6.32.45/arch/x
  #ifdef CONFIG_X86_32
  # include "uaccess_32.h"
  #else
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/vgtod.h linux-2.6.32.45/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.45/arch/x86/include/asm/vgtod.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/vgtod.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/vgtod.h linux-2.6.32.46/arch/x86/include/asm/vgtod.h
+--- linux-2.6.32.46/arch/x86/include/asm/vgtod.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/vgtod.h	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -11468,9 +11468,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/vgtod.h linux-2.6.32.45/arch/x86
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/vmi.h linux-2.6.32.45/arch/x86/include/asm/vmi.h
---- linux-2.6.32.45/arch/x86/include/asm/vmi.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/vmi.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi.h linux-2.6.32.46/arch/x86/include/asm/vmi.h
+--- linux-2.6.32.46/arch/x86/include/asm/vmi.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/vmi.h	2011-04-17 15:56:46.000000000 -0400
 @@ -191,6 +191,7 @@ struct vrom_header {
  	u8      reserved[96];   /* Reserved for headers */
  	char    vmi_init[8];    /* VMI_Init jump point */
@@ -11479,9 +11479,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/vmi.h linux-2.6.32.45/arch/x86/i
  } __attribute__((packed));
  
  struct pnp_header {
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/vmi_time.h linux-2.6.32.45/arch/x86/include/asm/vmi_time.h
---- linux-2.6.32.45/arch/x86/include/asm/vmi_time.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/vmi_time.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/vmi_time.h linux-2.6.32.46/arch/x86/include/asm/vmi_time.h
+--- linux-2.6.32.46/arch/x86/include/asm/vmi_time.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/vmi_time.h	2011-08-05 20:33:55.000000000 -0400
 @@ -43,7 +43,7 @@ extern struct vmi_timer_ops {
  	int (*wallclock_updated)(void);
  	void (*set_alarm)(u32 flags, u64 expiry, u64 period);
@@ -11491,9 +11491,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/vmi_time.h linux-2.6.32.45/arch/
  
  /* Prototypes */
  extern void __init vmi_time_init(void);
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/vsyscall.h linux-2.6.32.45/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.45/arch/x86/include/asm/vsyscall.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/vsyscall.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/vsyscall.h linux-2.6.32.46/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.32.46/arch/x86/include/asm/vsyscall.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/vsyscall.h	2011-04-17 15:56:46.000000000 -0400
 @@ -15,9 +15,10 @@ enum vsyscall_num {
  
  #ifdef __KERNEL__
@@ -11524,9 +11524,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/vsyscall.h linux-2.6.32.45/arch/
  #endif /* __KERNEL__ */
  
  #endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/x86_init.h linux-2.6.32.45/arch/x86/include/asm/x86_init.h
---- linux-2.6.32.45/arch/x86/include/asm/x86_init.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/x86_init.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/x86_init.h linux-2.6.32.46/arch/x86/include/asm/x86_init.h
+--- linux-2.6.32.46/arch/x86/include/asm/x86_init.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/x86_init.h	2011-08-05 20:33:55.000000000 -0400
 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
  	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
  	void (*find_smp_config)(unsigned int reserve);
@@ -11608,9 +11608,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/x86_init.h linux-2.6.32.45/arch/
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-2.6.32.45/arch/x86/include/asm/xsave.h linux-2.6.32.45/arch/x86/include/asm/xsave.h
---- linux-2.6.32.45/arch/x86/include/asm/xsave.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/include/asm/xsave.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/xsave.h linux-2.6.32.46/arch/x86/include/asm/xsave.h
+--- linux-2.6.32.46/arch/x86/include/asm/xsave.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/xsave.h	2011-04-17 15:56:46.000000000 -0400
 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
  static inline int xsave_user(struct xsave_struct __user *buf)
  {
@@ -11636,9 +11636,9 @@ diff -urNp linux-2.6.32.45/arch/x86/include/asm/xsave.h linux-2.6.32.45/arch/x86
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.45/arch/x86/Kconfig linux-2.6.32.45/arch/x86/Kconfig
---- linux-2.6.32.45/arch/x86/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/Kconfig linux-2.6.32.46/arch/x86/Kconfig
+--- linux-2.6.32.46/arch/x86/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE
  
  config X86_32_LAZY_GS
@@ -11720,9 +11720,9 @@ diff -urNp linux-2.6.32.45/arch/x86/Kconfig linux-2.6.32.45/arch/x86/Kconfig
  	---help---
  	  Map the 32-bit VDSO to the predictable old-style address too.
  	---help---
-diff -urNp linux-2.6.32.45/arch/x86/Kconfig.cpu linux-2.6.32.45/arch/x86/Kconfig.cpu
---- linux-2.6.32.45/arch/x86/Kconfig.cpu	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/Kconfig.cpu	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/Kconfig.cpu linux-2.6.32.46/arch/x86/Kconfig.cpu
+--- linux-2.6.32.46/arch/x86/Kconfig.cpu	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Kconfig.cpu	2011-04-17 15:56:46.000000000 -0400
 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -11750,9 +11750,9 @@ diff -urNp linux-2.6.32.45/arch/x86/Kconfig.cpu linux-2.6.32.45/arch/x86/Kconfig
  
  config X86_MINIMUM_CPU_FAMILY
  	int
-diff -urNp linux-2.6.32.45/arch/x86/Kconfig.debug linux-2.6.32.45/arch/x86/Kconfig.debug
---- linux-2.6.32.45/arch/x86/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/Kconfig.debug linux-2.6.32.46/arch/x86/Kconfig.debug
+--- linux-2.6.32.46/arch/x86/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
 @@ -99,7 +99,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
@@ -11762,9 +11762,9 @@ diff -urNp linux-2.6.32.45/arch/x86/Kconfig.debug linux-2.6.32.45/arch/x86/Kconf
  	---help---
  	  Mark the kernel read-only data as write-protected in the pagetables,
  	  in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile
---- linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile	2011-08-07 14:38:58.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile	2011-08-07 14:38:58.000000000 -0400
 @@ -41,6 +41,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -11775,9 +11775,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.4
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-01 18:53:40.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-01 18:53:40.000000000 -0400
 @@ -91,6 +91,9 @@ _start:
  	/* Do any other stuff... */
  
@@ -11805,9 +11805,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.4
  #else
  	pushw	$0
  	pushw	trampoline_segment
-diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c	2011-07-01 19:01:34.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/acpi/sleep.c	2011-07-01 19:01:34.000000000 -0400
 @@ -11,11 +11,12 @@
  #include <linux/cpumask.h>
  #include <asm/segment.h>
@@ -11854,9 +11854,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c linux-2.6.32.45/arch/x86
  }
  
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/acpi/wakeup_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
  	# and restore the stack ... but you need gdt for this to work
  	movl	saved_context_esp, %esp
@@ -11873,9 +11873,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.45/arch
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-2.6.32.45/arch/x86/kernel/alternative.c linux-2.6.32.45/arch/x86/kernel/alternative.c
---- linux-2.6.32.45/arch/x86/kernel/alternative.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/alternative.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/alternative.c linux-2.6.32.46/arch/x86/kernel/alternative.c
+--- linux-2.6.32.46/arch/x86/kernel/alternative.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/alternative.c	2011-04-17 15:56:46.000000000 -0400
 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
  
  		BUG_ON(p->len > MAX_PATCH_LEN);
@@ -11958,9 +11958,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/alternative.c linux-2.6.32.45/arch/x8
 +		BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
  	return addr;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/amd_iommu.c linux-2.6.32.45/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.45/arch/x86/kernel/amd_iommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/amd_iommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/amd_iommu.c linux-2.6.32.46/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.32.46/arch/x86/kernel/amd_iommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/amd_iommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(
  	}
  }
@@ -11970,9 +11970,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/amd_iommu.c linux-2.6.32.45/arch/x86/
  	.alloc_coherent = alloc_coherent,
  	.free_coherent = free_coherent,
  	.map_page = map_page,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/apic/apic.c linux-2.6.32.45/arch/x86/kernel/apic/apic.c
---- linux-2.6.32.45/arch/x86/kernel/apic/apic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/apic/apic.c	2011-08-17 20:00:16.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/apic.c linux-2.6.32.46/arch/x86/kernel/apic/apic.c
+--- linux-2.6.32.46/arch/x86/kernel/apic/apic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/apic/apic.c	2011-08-17 20:00:16.000000000 -0400
 @@ -170,7 +170,7 @@ int first_system_vector = 0xfe;
  /*
   * Debug level, exported for io_apic.c
@@ -12000,9 +12000,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/apic/apic.c linux-2.6.32.45/arch/x86/
  	bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
  	bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/apic/io_apic.c	2011-05-04 17:56:20.000000000 -0400
 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi
  	ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
  				GFP_ATOMIC);
@@ -12057,9 +12057,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c linux-2.6.32.45/arch/x
  		spin_lock(&ioapic_lock);
  		__mask_and_edge_IO_APIC_irq(cfg);
  		__unmask_and_level_IO_APIC_irq(cfg);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/apm_32.c linux-2.6.32.45/arch/x86/kernel/apm_32.c
---- linux-2.6.32.45/arch/x86/kernel/apm_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/apm_32.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/apm_32.c linux-2.6.32.46/arch/x86/kernel/apm_32.c
+--- linux-2.6.32.46/arch/x86/kernel/apm_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/apm_32.c	2011-04-23 12:56:10.000000000 -0400
 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -12140,9 +12140,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/apm_32.c linux-2.6.32.45/arch/x86/ker
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/asm-offsets_32.c	2011-05-16 21:46:57.000000000 -0400
 @@ -51,7 +51,6 @@ void foo(void)
  	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
  	BLANK();
@@ -12180,9 +12180,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.45/arch
  #endif
  
  #ifdef CONFIG_XEN
-diff -urNp linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c	2011-08-23 20:24:19.000000000 -0400
 @@ -44,6 +44,8 @@ int main(void)
  	ENTRY(addr_limit);
  	ENTRY(preempt_count);
@@ -12227,9 +12227,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.45/arch
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/amd.c linux-2.6.32.45/arch/x86/kernel/cpu/amd.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/amd.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/amd.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/amd.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/amd.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/amd.c	2011-06-25 12:56:37.000000000 -0400
 @@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
@@ -12239,9 +12239,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/amd.c linux-2.6.32.45/arch/x86/ke
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/common.c linux-2.6.32.45/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/common.c	2011-05-11 18:25:15.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/common.c linux-2.6.32.46/arch/x86/kernel/cpu/common.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/common.c	2011-05-11 18:25:15.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -12386,9 +12386,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/common.c linux-2.6.32.45/arch/x86
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/intel.c linux-2.6.32.45/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/intel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/intel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel.c linux-2.6.32.46/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/intel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/intel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug
  	 * Update the IDT descriptor and reload the IDT so that
  	 * it uses the read-only mapped virtual address.
@@ -12398,9 +12398,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/intel.c linux-2.6.32.45/arch/x86/
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
  	return ret;
  }
@@ -12410,9 +12410,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.45
  	.show   = show,
  	.store  = store,
  };
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/Makefile linux-2.6.32.45/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.45/arch/x86/kernel/cpu/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/Makefile linux-2.6.32.46/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.46/arch/x86/kernel/cpu/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
  CFLAGS_REMOVE_common.o = -pg
  endif
@@ -12424,9 +12424,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/Makefile linux-2.6.32.45/arch/x86
  obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
  obj-y			+= vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:56:59.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:57:13.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:56:59.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:57:13.000000000 -0400
 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
  	return ret;
  }
@@ -12436,9 +12436,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.45/
  	.show			= show,
  	.store			= store,
  };
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-04 17:56:20.000000000 -0400
 @@ -43,6 +43,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
@@ -12540,9 +12540,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.45/arch
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-05 20:33:55.000000000 -0400
 @@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi
  static int inject_init(void)
  {
@@ -12554,9 +12554,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.
  	register_die_notifier(&mce_raise_nb);
  	return 0;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
  	return 0;
  }
@@ -12566,9 +12566,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.45/arch/x
  	.vendor            = X86_VENDOR_AMD,
  	.set               = amd_set_mtrr,
  	.get               = amd_get_mtrr,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/centaur.c	2011-04-17 15:56:46.000000000 -0400
 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 
  	return 0;
  }
@@ -12578,9 +12578,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.45/ar
  	.vendor            = X86_VENDOR_CENTAUR,
  	.set               = centaur_set_mcr,
  	.get               = centaur_get_mcr,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/cyrix.c	2011-04-17 15:56:46.000000000 -0400
 @@ -265,7 +265,7 @@ static void cyrix_set_all(void)
  	post_set();
  }
@@ -12590,9 +12590,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.45/arch
  	.vendor            = X86_VENDOR_CYRIX,
  	.set_all	   = cyrix_set_all,
  	.set               = cyrix_set_arr,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/generic.c	2011-04-23 12:56:10.000000000 -0400
 @@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
  /*
   * Generic structure...
@@ -12602,9 +12602,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.45/ar
  	.use_intel_if		= 1,
  	.set_all		= generic_set_all,
  	.get			= generic_get_mtrr,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/main.c	2011-04-17 17:03:05.000000000 -0400
 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -12623,9 +12623,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.45/arch/
  {
  	if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
  		mtrr_ops[ops->vendor] = ops;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-26 20:23:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-26 20:23:57.000000000 -0400
 @@ -25,14 +25,14 @@ struct mtrr_ops {
  	int	(*validate_add_page)(unsigned long base, unsigned long size,
  				     unsigned int type);
@@ -12656,9 +12656,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.45/arch/
  
  #define is_cpu(vnd)	(mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
  #define use_intel()	(mtrr_if && mtrr_if->use_intel_if == 1)
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
  
  /* Interface defining a CPU specific perfctr watchdog */
@@ -12692,9 +12692,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.4
  static struct wd_ops intel_arch_wd_ops __read_mostly = {
  	.reserve	= single_msr_reserve,
  	.unreserve	= single_msr_unreserve,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c	2011-05-04 17:56:20.000000000 -0400
 @@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event 
  	 * count to the generic event atomically:
  	 */
@@ -12735,9 +12735,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.45/arch
  	}
  }
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/crash.c linux-2.6.32.45/arch/x86/kernel/crash.c
---- linux-2.6.32.45/arch/x86/kernel/crash.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/crash.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/crash.c linux-2.6.32.46/arch/x86/kernel/crash.c
+--- linux-2.6.32.46/arch/x86/kernel/crash.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/crash.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
@@ -12747,9 +12747,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/crash.c linux-2.6.32.45/arch/x86/kern
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-2.6.32.45/arch/x86/kernel/doublefault_32.c linux-2.6.32.45/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.45/arch/x86/kernel/doublefault_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/doublefault_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/doublefault_32.c linux-2.6.32.46/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.32.46/arch/x86/kernel/doublefault_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/doublefault_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -12781,9 +12781,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/doublefault_32.c linux-2.6.32.45/arch
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task
  #endif
  
@@ -12849,9 +12849,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c linux-2.6.32.45/arch/x
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c
+--- linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task
  	unsigned long *irq_stack_end =
  		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -12902,9 +12902,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c linux-2.6.32.45/arch/x
  	put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack.c linux-2.6.32.45/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.45/arch/x86/kernel/dumpstack.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/dumpstack.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.c linux-2.6.32.46/arch/x86/kernel/dumpstack.c
+--- linux-2.6.32.46/arch/x86/kernel/dumpstack.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/dumpstack.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -13021,9 +13021,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack.c linux-2.6.32.45/arch/x86/
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack.h linux-2.6.32.45/arch/x86/kernel/dumpstack.h
---- linux-2.6.32.45/arch/x86/kernel/dumpstack.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/dumpstack.h	2011-04-23 13:25:26.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.h linux-2.6.32.46/arch/x86/kernel/dumpstack.h
+--- linux-2.6.32.46/arch/x86/kernel/dumpstack.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/dumpstack.h	2011-04-23 13:25:26.000000000 -0400
 @@ -15,7 +15,7 @@
  #endif
  
@@ -13033,9 +13033,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack.h linux-2.6.32.45/arch/x86/
  		unsigned long *stack, unsigned long bp,
  		const struct stacktrace_ops *ops, void *data,
  		unsigned long *end, int *graph);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/e820.c linux-2.6.32.45/arch/x86/kernel/e820.c
---- linux-2.6.32.45/arch/x86/kernel/e820.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/e820.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/e820.c linux-2.6.32.46/arch/x86/kernel/e820.c
+--- linux-2.6.32.46/arch/x86/kernel/e820.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/e820.c	2011-04-17 15:56:46.000000000 -0400
 @@ -733,7 +733,7 @@ struct early_res {
  };
  static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -13045,9 +13045,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/e820.c linux-2.6.32.45/arch/x86/kerne
  };
  
  static int __init find_overlapped_early(u64 start, u64 end)
-diff -urNp linux-2.6.32.45/arch/x86/kernel/early_printk.c linux-2.6.32.45/arch/x86/kernel/early_printk.c
---- linux-2.6.32.45/arch/x86/kernel/early_printk.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/early_printk.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/early_printk.c linux-2.6.32.46/arch/x86/kernel/early_printk.c
+--- linux-2.6.32.46/arch/x86/kernel/early_printk.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/early_printk.c	2011-05-16 21:46:57.000000000 -0400
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -13065,9 +13065,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/early_printk.c linux-2.6.32.45/arch/x
  	va_start(ap, fmt);
  	n = vscnprintf(buf, sizeof(buf), fmt, ap);
  	early_console->write(early_console, buf, n);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/efi_32.c linux-2.6.32.45/arch/x86/kernel/efi_32.c
---- linux-2.6.32.45/arch/x86/kernel/efi_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/efi_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_32.c linux-2.6.32.46/arch/x86/kernel/efi_32.c
+--- linux-2.6.32.46/arch/x86/kernel/efi_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/efi_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -38,70 +38,38 @@
   */
  
@@ -13148,9 +13148,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/efi_32.c linux-2.6.32.45/arch/x86/ker
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/efi_stub_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -13249,9 +13249,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S linux-2.6.32.45/arch/x8
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/kernel/entry_32.S
---- linux-2.6.32.45/arch/x86/kernel/entry_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/entry_32.S	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_32.S linux-2.6.32.46/arch/x86/kernel/entry_32.S
+--- linux-2.6.32.46/arch/x86/kernel/entry_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/entry_32.S	2011-08-30 18:19:52.000000000 -0400
 @@ -185,13 +185,146 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
@@ -13490,13 +13490,14 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -455,12 +616,23 @@ sysenter_do_call:
+@@ -455,12 +616,24 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
 +	pushl_cfi %eax
++	movl %esp, %eax
 +	call pax_randomize_kstack
 +	popl_cfi %eax
 +#endif
@@ -13514,7 +13515,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -477,6 +649,9 @@ sysenter_audit:
+@@ -477,6 +650,9 @@ sysenter_audit:
  	movl %eax,%edx			/* 2nd arg: syscall number */
  	movl $AUDIT_ARCH_I386,%eax	/* 1st arg: audit arch */
  	call audit_syscall_entry
@@ -13524,7 +13525,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	pushl %ebx
  	CFI_ADJUST_CFA_OFFSET 4
  	movl PT_EAX(%esp),%eax		/* reload syscall number */
-@@ -504,11 +679,17 @@ sysexit_audit:
+@@ -504,11 +680,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -13544,13 +13545,14 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -538,6 +719,14 @@ syscall_exit:
+@@ -538,6 +720,15 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
 +restore_all_pax:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
++	movl %esp, %eax
 +	call pax_randomize_kstack
 +#endif
 +
@@ -13559,7 +13561,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -602,10 +791,29 @@ ldt_ss:
+@@ -602,10 +793,29 @@ ldt_ss:
  	mov PT_OLDESP(%esp), %eax	/* load userspace esp */
  	mov %dx, %ax			/* eax: new kernel esp */
  	sub %eax, %edx			/* offset (low word is 0) */
@@ -13590,7 +13592,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	pushl $__ESPFIX_SS
  	CFI_ADJUST_CFA_OFFSET 4
  	push %eax			/* new kernel esp */
-@@ -636,31 +844,25 @@ work_resched:
+@@ -636,31 +846,25 @@ work_resched:
  	movl TI_flags(%ebp), %ecx
  	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other
  					# than syscall tracing?
@@ -13626,7 +13628,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  #endif
  	xorl %edx, %edx
  	call do_notify_resume
-@@ -673,6 +875,9 @@ syscall_trace_entry:
+@@ -673,6 +877,9 @@ syscall_trace_entry:
  	movl $-ENOSYS,PT_EAX(%esp)
  	movl %esp, %eax
  	call syscall_trace_enter
@@ -13636,7 +13638,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	/* What it returned is what we'll actually use.  */
  	cmpl $(nr_syscalls), %eax
  	jnae syscall_call
-@@ -695,6 +900,10 @@ END(syscall_exit_work)
+@@ -695,6 +902,10 @@ END(syscall_exit_work)
  
  	RING0_INT_FRAME			# can't unwind into user space anyway
  syscall_fault:
@@ -13647,7 +13649,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	GET_THREAD_INFO(%ebp)
  	movl $-EFAULT,PT_EAX(%esp)
  	jmp resume_userspace
-@@ -726,6 +935,33 @@ PTREGSCALL(rt_sigreturn)
+@@ -726,6 +937,33 @@ PTREGSCALL(rt_sigreturn)
  PTREGSCALL(vm86)
  PTREGSCALL(vm86old)
  
@@ -13681,7 +13683,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -735,7 +971,13 @@ PTREGSCALL(vm86old)
+@@ -735,7 +973,13 @@ PTREGSCALL(vm86old)
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -13696,7 +13698,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
  	mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
  	shl $16, %eax
-@@ -1198,7 +1440,6 @@ return_to_handler:
+@@ -1198,7 +1442,6 @@ return_to_handler:
  	ret
  #endif
  
@@ -13704,7 +13706,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1255,9 +1496,12 @@ error_code:
+@@ -1255,9 +1498,12 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -13718,7 +13720,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	TRACE_IRQS_OFF
  	movl %esp,%eax			# pt_regs pointer
  	call *%edi
-@@ -1351,6 +1595,9 @@ nmi_stack_correct:
+@@ -1351,6 +1597,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -13728,7 +13730,7 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1391,6 +1638,9 @@ nmi_espfix_stack:
+@@ -1391,6 +1640,9 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -13738,9 +13740,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/arch/x86/k
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_64.S linux-2.6.32.45/arch/x86/kernel/entry_64.S
---- linux-2.6.32.45/arch/x86/kernel/entry_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/entry_64.S	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/entry_64.S linux-2.6.32.46/arch/x86/kernel/entry_64.S
+--- linux-2.6.32.46/arch/x86/kernel/entry_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/entry_64.S	2011-08-26 20:19:09.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -14312,9 +14314,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_64.S linux-2.6.32.45/arch/x86/k
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff -urNp linux-2.6.32.45/arch/x86/kernel/ftrace.c linux-2.6.32.45/arch/x86/kernel/ftrace.c
---- linux-2.6.32.45/arch/x86/kernel/ftrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/ftrace.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/ftrace.c linux-2.6.32.46/arch/x86/kernel/ftrace.c
+--- linux-2.6.32.46/arch/x86/kernel/ftrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/ftrace.c	2011-05-04 17:56:20.000000000 -0400
 @@ -103,7 +103,7 @@ static void *mod_code_ip;		/* holds the 
  static void *mod_code_newcode;		/* holds the text to write to the IP */
  
@@ -14400,9 +14402,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/ftrace.c linux-2.6.32.45/arch/x86/ker
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/head32.c linux-2.6.32.45/arch/x86/kernel/head32.c
---- linux-2.6.32.45/arch/x86/kernel/head32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/head32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/head32.c linux-2.6.32.46/arch/x86/kernel/head32.c
+--- linux-2.6.32.46/arch/x86/kernel/head32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/head32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <asm/apic.h>
  #include <asm/io_apic.h>
@@ -14420,9 +14422,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/head32.c linux-2.6.32.45/arch/x86/ker
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-2.6.32.45/arch/x86/kernel/head_32.S linux-2.6.32.45/arch/x86/kernel/head_32.S
---- linux-2.6.32.45/arch/x86/kernel/head_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/head_32.S	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/head_32.S linux-2.6.32.46/arch/x86/kernel/head_32.S
+--- linux-2.6.32.46/arch/x86/kernel/head_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/head_32.S	2011-07-06 19:53:33.000000000 -0400
 @@ -19,10 +19,17 @@
  #include <asm/setup.h>
  #include <asm/processor-flags.h>
@@ -14944,9 +14946,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/head_32.S linux-2.6.32.45/arch/x86/ke
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff -urNp linux-2.6.32.45/arch/x86/kernel/head_64.S linux-2.6.32.45/arch/x86/kernel/head_64.S
---- linux-2.6.32.45/arch/x86/kernel/head_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/head_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/head_64.S linux-2.6.32.46/arch/x86/kernel/head_64.S
+--- linux-2.6.32.46/arch/x86/kernel/head_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/head_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -15217,9 +15219,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/head_64.S linux-2.6.32.45/arch/x86/ke
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/i386_ksyms_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -15241,9 +15243,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.45/arch/
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-2.6.32.45/arch/x86/kernel/i8259.c linux-2.6.32.45/arch/x86/kernel/i8259.c
---- linux-2.6.32.45/arch/x86/kernel/i8259.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/i8259.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/i8259.c linux-2.6.32.46/arch/x86/kernel/i8259.c
+--- linux-2.6.32.46/arch/x86/kernel/i8259.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/i8259.c	2011-05-04 17:56:28.000000000 -0400
 @@ -208,7 +208,7 @@ spurious_8259A_irq:
  			       "spurious 8259A interrupt: IRQ%d.\n", irq);
  			spurious_irq_mask |= irqmask;
@@ -15253,9 +15255,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/i8259.c linux-2.6.32.45/arch/x86/kern
  		/*
  		 * Theoretically we do not have to handle this IRQ,
  		 * but in Linux this does not cause problems and is
-diff -urNp linux-2.6.32.45/arch/x86/kernel/init_task.c linux-2.6.32.45/arch/x86/kernel/init_task.c
---- linux-2.6.32.45/arch/x86/kernel/init_task.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/init_task.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/init_task.c linux-2.6.32.46/arch/x86/kernel/init_task.c
+--- linux-2.6.32.46/arch/x86/kernel/init_task.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/init_task.c	2011-04-17 15:56:46.000000000 -0400
 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
   * way process stacks are handled. This is done by having a special
   * "init_task" linker map entry..
@@ -15274,9 +15276,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/init_task.c linux-2.6.32.45/arch/x86/
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/ioport.c linux-2.6.32.45/arch/x86/kernel/ioport.c
---- linux-2.6.32.45/arch/x86/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/ioport.c linux-2.6.32.46/arch/x86/kernel/ioport.c
+--- linux-2.6.32.46/arch/x86/kernel/ioport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/ioport.c	2011-04-17 15:56:46.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -15320,9 +15322,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/ioport.c linux-2.6.32.45/arch/x86/ker
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-2.6.32.45/arch/x86/kernel/irq_32.c linux-2.6.32.45/arch/x86/kernel/irq_32.c
---- linux-2.6.32.45/arch/x86/kernel/irq_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/irq_32.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/irq_32.c linux-2.6.32.46/arch/x86/kernel/irq_32.c
+--- linux-2.6.32.46/arch/x86/kernel/irq_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/irq_32.c	2011-07-06 19:53:33.000000000 -0400
 @@ -35,7 +35,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -15463,9 +15465,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/irq_32.c linux-2.6.32.45/arch/x86/ker
  		/*
  		 * Shouldnt happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-2.6.32.45/arch/x86/kernel/irq.c linux-2.6.32.45/arch/x86/kernel/irq.c
---- linux-2.6.32.45/arch/x86/kernel/irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/irq.c linux-2.6.32.46/arch/x86/kernel/irq.c
+--- linux-2.6.32.46/arch/x86/kernel/irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -15,7 +15,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -15500,9 +15502,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/irq.c linux-2.6.32.45/arch/x86/kernel
  #endif
  	return sum;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/kgdb.c linux-2.6.32.45/arch/x86/kernel/kgdb.c
---- linux-2.6.32.45/arch/x86/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/kgdb.c linux-2.6.32.46/arch/x86/kernel/kgdb.c
+--- linux-2.6.32.46/arch/x86/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
 @@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vec
  
  		/* clear the trace bit */
@@ -15537,9 +15539,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/kgdb.c linux-2.6.32.45/arch/x86/kerne
  	/* Breakpoint instruction: */
  	.gdb_bpt_instr		= { 0xcc },
  	.flags			= KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/kprobes.c linux-2.6.32.45/arch/x86/kernel/kprobes.c
---- linux-2.6.32.45/arch/x86/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/kprobes.c linux-2.6.32.46/arch/x86/kernel/kprobes.c
+--- linux-2.6.32.46/arch/x86/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
  		char op;
  		s32 raddr;
@@ -15641,9 +15643,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/kprobes.c linux-2.6.32.45/arch/x86/ke
  		return ret;
  
  	switch (val) {
-diff -urNp linux-2.6.32.45/arch/x86/kernel/kvm.c linux-2.6.32.45/arch/x86/kernel/kvm.c
---- linux-2.6.32.45/arch/x86/kernel/kvm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/kvm.c	2011-08-24 18:35:52.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/kvm.c linux-2.6.32.46/arch/x86/kernel/kvm.c
+--- linux-2.6.32.46/arch/x86/kernel/kvm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/kvm.c	2011-08-24 18:35:52.000000000 -0400
 @@ -216,6 +216,7 @@ static void __init paravirt_ops_setup(vo
  		pv_mmu_ops.set_pud = kvm_set_pud;
  #if PAGETABLE_LEVELS == 4
@@ -15652,9 +15654,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/kvm.c linux-2.6.32.45/arch/x86/kernel
  #endif
  #endif
  		pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/ldt.c linux-2.6.32.45/arch/x86/kernel/ldt.c
---- linux-2.6.32.45/arch/x86/kernel/ldt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/ldt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/ldt.c linux-2.6.32.46/arch/x86/kernel/ldt.c
+--- linux-2.6.32.46/arch/x86/kernel/ldt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/ldt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
@@ -15719,9 +15721,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/ldt.c linux-2.6.32.45/arch/x86/kernel
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/machine_kexec_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,7 +26,7 @@
  #include <asm/system.h>
  #include <asm/cacheflush.h>
@@ -15749,9 +15751,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.45/ar
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_amd.c linux-2.6.32.45/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.45/arch/x86/kernel/microcode_amd.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/microcode_amd.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_amd.c linux-2.6.32.46/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.32.46/arch/x86/kernel/microcode_amd.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/microcode_amd.c	2011-04-17 17:03:05.000000000 -0400
 @@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c
  	uci->mc = NULL;
  }
@@ -15770,9 +15772,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_amd.c linux-2.6.32.45/arch/
  {
  	return &microcode_amd_ops;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_core.c linux-2.6.32.45/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.45/arch/x86/kernel/microcode_core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/microcode_core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_core.c linux-2.6.32.46/arch/x86/kernel/microcode_core.c
+--- linux-2.6.32.46/arch/x86/kernel/microcode_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/microcode_core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
  
  #define MICROCODE_VERSION	"2.00"
@@ -15782,9 +15784,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_core.c linux-2.6.32.45/arch
  
  /*
   * Synchronization.
-diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_intel.c linux-2.6.32.45/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.45/arch/x86/kernel/microcode_intel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/microcode_intel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/microcode_intel.c linux-2.6.32.46/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.32.46/arch/x86/kernel/microcode_intel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/microcode_intel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -15819,9 +15821,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_intel.c linux-2.6.32.45/arc
  {
  	return &microcode_intel_ops;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/module.c linux-2.6.32.45/arch/x86/kernel/module.c
---- linux-2.6.32.45/arch/x86/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/module.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/module.c linux-2.6.32.46/arch/x86/kernel/module.c
+--- linux-2.6.32.46/arch/x86/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/module.c	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@
  #define DEBUGP(fmt...)
  #endif
@@ -15962,9 +15964,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/module.c linux-2.6.32.45/arch/x86/ker
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/paravirt.c linux-2.6.32.45/arch/x86/kernel/paravirt.c
---- linux-2.6.32.45/arch/x86/kernel/paravirt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/paravirt.c	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt.c linux-2.6.32.46/arch/x86/kernel/paravirt.c
+--- linux-2.6.32.46/arch/x86/kernel/paravirt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/paravirt.c	2011-08-23 20:24:19.000000000 -0400
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
  	return x;
@@ -16112,9 +16114,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/paravirt.c linux-2.6.32.45/arch/x86/k
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
  	__raw_spin_lock(lock);
  }
@@ -16124,9 +16126,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.45/
  #ifdef CONFIG_SMP
  	.spin_is_locked = __ticket_spin_is_locked,
  	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
  	free_pages((unsigned long)vaddr, get_order(size));
  }
@@ -16136,9 +16138,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.45/arch
  	.alloc_coherent = calgary_alloc_coherent,
  	.free_coherent = calgary_free_coherent,
  	.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-dma.c linux-2.6.32.45/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.45/arch/x86/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/pci-dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-dma.c linux-2.6.32.46/arch/x86/kernel/pci-dma.c
+--- linux-2.6.32.46/arch/x86/kernel/pci-dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/pci-dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,7 +14,7 @@
  
  static int forbid_dac __read_mostly;
@@ -16157,9 +16159,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-dma.c linux-2.6.32.45/arch/x86/ke
  
  #ifdef CONFIG_PCI
  	if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/pci-gart_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
  	return -1;
  }
@@ -16169,9 +16171,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c linux-2.6.32.45/arch/x8
  	.map_sg				= gart_map_sg,
  	.unmap_sg			= gart_unmap_sg,
  	.map_page			= gart_map_page,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-nommu.c linux-2.6.32.45/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.45/arch/x86/kernel/pci-nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/pci-nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-nommu.c linux-2.6.32.46/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.32.46/arch/x86/kernel/pci-nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/pci-nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
  	flush_write_buffers();
  }
@@ -16181,9 +16183,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-nommu.c linux-2.6.32.45/arch/x86/
  	.alloc_coherent		= dma_generic_alloc_coherent,
  	.free_coherent		= nommu_free_coherent,
  	.map_sg			= nommu_map_sg,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
  	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
  }
@@ -16193,9 +16195,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.45/arch/x8
  	.mapping_error = swiotlb_dma_mapping_error,
  	.alloc_coherent = x86_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.32.45/arch/x86/kernel/process_32.c linux-2.6.32.45/arch/x86/kernel/process_32.c
---- linux-2.6.32.45/arch/x86/kernel/process_32.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/process_32.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/process_32.c linux-2.6.32.46/arch/x86/kernel/process_32.c
+--- linux-2.6.32.46/arch/x86/kernel/process_32.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/process_32.c	2011-06-25 12:56:37.000000000 -0400
 @@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -16296,9 +16298,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/process_32.c linux-2.6.32.45/arch/x86
  	return 0;
  }
 -
-diff -urNp linux-2.6.32.45/arch/x86/kernel/process_64.c linux-2.6.32.45/arch/x86/kernel/process_64.c
---- linux-2.6.32.45/arch/x86/kernel/process_64.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/process_64.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/process_64.c linux-2.6.32.46/arch/x86/kernel/process_64.c
+--- linux-2.6.32.46/arch/x86/kernel/process_64.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/process_64.c	2011-06-25 12:56:37.000000000 -0400
 @@ -91,7 +91,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -16372,9 +16374,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/process_64.c linux-2.6.32.45/arch/x86
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.45/arch/x86/kernel/process.c linux-2.6.32.45/arch/x86/kernel/process.c
---- linux-2.6.32.45/arch/x86/kernel/process.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/process.c	2011-05-22 23:02:03.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/process.c linux-2.6.32.46/arch/x86/kernel/process.c
+--- linux-2.6.32.46/arch/x86/kernel/process.c	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/process.c	2011-08-30 18:19:52.000000000 -0400
 @@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -16441,13 +16443,13 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/process.c linux-2.6.32.45/arch/x86/ke
  {
  	local_irq_disable();
  	/*
-@@ -568,16 +588,35 @@ static int __init idle_setup(char *str)
+@@ -568,16 +588,38 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
 -unsigned long arch_align_stack(unsigned long sp)
 +#ifdef CONFIG_PAX_RANDKSTACK
-+asmlinkage void pax_randomize_kstack(void)
++void pax_randomize_kstack(struct pt_regs *regs)
  {
 -	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
 -		sp -= get_random_int() % 8192;
@@ -16463,6 +16465,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/process.c linux-2.6.32.45/arch/x86/ke
 +	if (!randomize_va_space)
 +		return;
 +
++	if (v8086_mode(regs))
++		return;
++
 +	rdtscl(time);
 +
 +	/* P4 seems to return a 0 LSB, ignore it */
@@ -16486,9 +16491,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/process.c linux-2.6.32.45/arch/x86/ke
  }
 +#endif
  
-diff -urNp linux-2.6.32.45/arch/x86/kernel/ptrace.c linux-2.6.32.45/arch/x86/kernel/ptrace.c
---- linux-2.6.32.45/arch/x86/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/ptrace.c linux-2.6.32.46/arch/x86/kernel/ptrace.c
+--- linux-2.6.32.46/arch/x86/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -925,7 +925,7 @@ static const struct user_regset_view use
  long arch_ptrace(struct task_struct *child, long request, long addr, long data)
  {
@@ -16575,9 +16580,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/ptrace.c linux-2.6.32.45/arch/x86/ker
  {
  	if (unlikely(current->audit_context))
  		audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/reboot.c linux-2.6.32.45/arch/x86/kernel/reboot.c
---- linux-2.6.32.45/arch/x86/kernel/reboot.c	2011-08-09 18:35:28.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/reboot.c	2011-08-09 18:33:59.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/reboot.c linux-2.6.32.46/arch/x86/kernel/reboot.c
+--- linux-2.6.32.46/arch/x86/kernel/reboot.c	2011-08-09 18:35:28.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/reboot.c	2011-08-09 18:33:59.000000000 -0400
 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -16704,9 +16709,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/reboot.c linux-2.6.32.45/arch/x86/ker
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-2.6.32.45/arch/x86/kernel/setup.c linux-2.6.32.45/arch/x86/kernel/setup.c
---- linux-2.6.32.45/arch/x86/kernel/setup.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/setup.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/setup.c linux-2.6.32.46/arch/x86/kernel/setup.c
+--- linux-2.6.32.46/arch/x86/kernel/setup.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/setup.c	2011-04-17 17:03:05.000000000 -0400
 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
  
  	if (!boot_params.hdr.root_flags)
@@ -16727,9 +16732,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/setup.c linux-2.6.32.45/arch/x86/kern
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/setup_percpu.c linux-2.6.32.45/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.45/arch/x86/kernel/setup_percpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/setup_percpu.c	2011-06-04 20:36:29.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/setup_percpu.c linux-2.6.32.46/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.32.46/arch/x86/kernel/setup_percpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/setup_percpu.c	2011-06-04 20:36:29.000000000 -0400
 @@ -25,19 +25,17 @@
  # define DBG(x...)
  #endif
@@ -16793,9 +16798,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/setup_percpu.c linux-2.6.32.45/arch/x
  		/*
  		 * Up to this point, the boot CPU has been using .data.init
  		 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.32.45/arch/x86/kernel/signal.c linux-2.6.32.45/arch/x86/kernel/signal.c
---- linux-2.6.32.45/arch/x86/kernel/signal.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/signal.c	2011-05-22 23:02:03.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/signal.c linux-2.6.32.46/arch/x86/kernel/signal.c
+--- linux-2.6.32.46/arch/x86/kernel/signal.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/signal.c	2011-05-22 23:02:03.000000000 -0400
 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
  	 * Align the stack pointer according to the i386 ABI,
  	 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -16879,9 +16884,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/signal.c linux-2.6.32.45/arch/x86/ker
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.32.45/arch/x86/kernel/smpboot.c linux-2.6.32.45/arch/x86/kernel/smpboot.c
---- linux-2.6.32.45/arch/x86/kernel/smpboot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/smpboot.c	2011-07-01 19:10:03.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/smpboot.c linux-2.6.32.46/arch/x86/kernel/smpboot.c
+--- linux-2.6.32.46/arch/x86/kernel/smpboot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/smpboot.c	2011-07-01 19:10:03.000000000 -0400
 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct
   */
  static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
@@ -16951,9 +16956,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/smpboot.c linux-2.6.32.45/arch/x86/ke
  	err = do_boot_cpu(apicid, cpu);
  
  	if (err) {
-diff -urNp linux-2.6.32.45/arch/x86/kernel/step.c linux-2.6.32.45/arch/x86/kernel/step.c
---- linux-2.6.32.45/arch/x86/kernel/step.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/step.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/step.c linux-2.6.32.46/arch/x86/kernel/step.c
+--- linux-2.6.32.46/arch/x86/kernel/step.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/step.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
@@ -16996,17 +17001,17 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/step.c linux-2.6.32.45/arch/x86/kerne
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
-diff -urNp linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -24,6 +24,21 @@
  
  #include <asm/syscalls.h>
@@ -17278,9 +17283,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c linux-2.6.32.45/arch/x8
 -	: "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
 -	return __res;
 -}
-diff -urNp linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -17418,9 +17423,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c linux-2.6.32.45/arch/x86
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/tboot.c linux-2.6.32.45/arch/x86/kernel/tboot.c
---- linux-2.6.32.45/arch/x86/kernel/tboot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/tboot.c	2011-05-22 23:02:03.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/tboot.c linux-2.6.32.46/arch/x86/kernel/tboot.c
+--- linux-2.6.32.46/arch/x86/kernel/tboot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/tboot.c	2011-05-22 23:02:03.000000000 -0400
 @@ -216,7 +216,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
@@ -17469,9 +17474,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/tboot.c linux-2.6.32.45/arch/x86/kern
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/time.c linux-2.6.32.45/arch/x86/kernel/time.c
---- linux-2.6.32.45/arch/x86/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/time.c linux-2.6.32.46/arch/x86/kernel/time.c
+--- linux-2.6.32.46/arch/x86/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,17 +26,13 @@
  int timer_ack;
  #endif
@@ -17510,9 +17515,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/time.c linux-2.6.32.45/arch/x86/kerne
  	}
  	return pc;
  }
-diff -urNp linux-2.6.32.45/arch/x86/kernel/tls.c linux-2.6.32.45/arch/x86/kernel/tls.c
---- linux-2.6.32.45/arch/x86/kernel/tls.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/tls.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/tls.c linux-2.6.32.46/arch/x86/kernel/tls.c
+--- linux-2.6.32.46/arch/x86/kernel/tls.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/tls.c	2011-04-17 15:56:46.000000000 -0400
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
  	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
  		return -EINVAL;
@@ -17525,9 +17530,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/tls.c linux-2.6.32.45/arch/x86/kernel
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-2.6.32.45/arch/x86/kernel/trampoline_32.S linux-2.6.32.45/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.45/arch/x86/kernel/trampoline_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/trampoline_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_32.S linux-2.6.32.46/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.32.46/arch/x86/kernel/trampoline_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/trampoline_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -17550,9 +17555,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/trampoline_32.S linux-2.6.32.45/arch/
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.32.45/arch/x86/kernel/trampoline_64.S linux-2.6.32.45/arch/x86/kernel/trampoline_64.S
---- linux-2.6.32.45/arch/x86/kernel/trampoline_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/trampoline_64.S	2011-07-01 18:53:26.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/trampoline_64.S linux-2.6.32.46/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.32.46/arch/x86/kernel/trampoline_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/trampoline_64.S	2011-07-01 18:53:26.000000000 -0400
 @@ -91,7 +91,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
@@ -17580,9 +17585,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/trampoline_64.S linux-2.6.32.45/arch/
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-2.6.32.45/arch/x86/kernel/traps.c linux-2.6.32.45/arch/x86/kernel/traps.c
---- linux-2.6.32.45/arch/x86/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/traps.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/traps.c linux-2.6.32.46/arch/x86/kernel/traps.c
+--- linux-2.6.32.46/arch/x86/kernel/traps.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/traps.c	2011-07-06 19:53:33.000000000 -0400
 @@ -69,12 +69,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -17769,9 +17774,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/traps.c linux-2.6.32.45/arch/x86/kern
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S
---- linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S	1969-12-31 19:00:00.000000000 -0500
+diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S
+--- linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S	1969-12-31 19:00:00.000000000 -0500
 @@ -1,105 +0,0 @@
 -/*
 - *
@@ -17878,9 +17883,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.45/arch/
 -	popfl				# Restore caller passed flags
 -	xorl %eax, %eax
 -	ret
-diff -urNp linux-2.6.32.45/arch/x86/kernel/verify_cpu.S linux-2.6.32.45/arch/x86/kernel/verify_cpu.S
---- linux-2.6.32.45/arch/x86/kernel/verify_cpu.S	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/arch/x86/kernel/verify_cpu.S	2011-07-01 18:28:42.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu.S linux-2.6.32.46/arch/x86/kernel/verify_cpu.S
+--- linux-2.6.32.46/arch/x86/kernel/verify_cpu.S	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/arch/x86/kernel/verify_cpu.S	2011-07-01 18:28:42.000000000 -0400
 @@ -0,0 +1,140 @@
 +/*
 + *
@@ -18022,9 +18027,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/verify_cpu.S linux-2.6.32.45/arch/x86
 +	popfl				# Restore caller passed flags
 +	xorl %eax, %eax
 +	ret
-diff -urNp linux-2.6.32.45/arch/x86/kernel/vm86_32.c linux-2.6.32.45/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.45/arch/x86/kernel/vm86_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/vm86_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/vm86_32.c linux-2.6.32.46/arch/x86/kernel/vm86_32.c
+--- linux-2.6.32.46/arch/x86/kernel/vm86_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/vm86_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -18089,9 +18094,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/vm86_32.c linux-2.6.32.45/arch/x86/ke
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.32.45/arch/x86/kernel/vmi_32.c linux-2.6.32.45/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.45/arch/x86/kernel/vmi_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/vmi_32.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/vmi_32.c linux-2.6.32.46/arch/x86/kernel/vmi_32.c
+--- linux-2.6.32.46/arch/x86/kernel/vmi_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/vmi_32.c	2011-08-05 20:33:55.000000000 -0400
 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 
  typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
  
@@ -18254,9 +18259,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/vmi_32.c linux-2.6.32.45/arch/x86/ker
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/vmlinux.lds.S	2011-04-17 15:56:46.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -18549,9 +18554,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.45/arch/x8
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/vsyscall_64.c	2011-04-23 12:56:10.000000000 -0400
 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
  
  	write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -18569,9 +18574,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c linux-2.6.32.45/arch/x8
  		p = tcache->blob[1];
  	} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
  		/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/x8664_ksyms_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
  
  EXPORT_SYMBOL(copy_user_generic);
@@ -18581,9 +18586,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.45/arch
  EXPORT_SYMBOL(__copy_from_user_inatomic);
  
  EXPORT_SYMBOL(copy_page);
-diff -urNp linux-2.6.32.45/arch/x86/kernel/xsave.c linux-2.6.32.45/arch/x86/kernel/xsave.c
---- linux-2.6.32.45/arch/x86/kernel/xsave.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kernel/xsave.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kernel/xsave.c linux-2.6.32.46/arch/x86/kernel/xsave.c
+--- linux-2.6.32.46/arch/x86/kernel/xsave.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/xsave.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -1;
@@ -18611,9 +18616,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kernel/xsave.c linux-2.6.32.45/arch/x86/kern
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-2.6.32.45/arch/x86/kvm/emulate.c linux-2.6.32.45/arch/x86/kvm/emulate.c
---- linux-2.6.32.45/arch/x86/kvm/emulate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kvm/emulate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kvm/emulate.c linux-2.6.32.46/arch/x86/kvm/emulate.c
+--- linux-2.6.32.46/arch/x86/kvm/emulate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kvm/emulate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -81,8 +81,8 @@
  #define Src2CL      (1<<29)
  #define Src2ImmByte (2<<29)
@@ -18650,9 +18655,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kvm/emulate.c linux-2.6.32.45/arch/x86/kvm/e
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b");  \
-diff -urNp linux-2.6.32.45/arch/x86/kvm/lapic.c linux-2.6.32.45/arch/x86/kvm/lapic.c
---- linux-2.6.32.45/arch/x86/kvm/lapic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kvm/lapic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kvm/lapic.c linux-2.6.32.46/arch/x86/kvm/lapic.c
+--- linux-2.6.32.46/arch/x86/kvm/lapic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kvm/lapic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -52,7 +52,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -18662,9 +18667,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kvm/lapic.c linux-2.6.32.45/arch/x86/kvm/lap
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h
---- linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h
+--- linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kvm/paging_tmpl.h	2011-05-16 21:46:57.000000000 -0400
 @@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_
  	int level = PT_PAGE_TABLE_LEVEL;
  	unsigned long mmu_seq;
@@ -18674,9 +18679,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h linux-2.6.32.45/arch/x86/k
  	pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
  	kvm_mmu_audit(vcpu, "pre page fault");
  
-diff -urNp linux-2.6.32.45/arch/x86/kvm/svm.c linux-2.6.32.45/arch/x86/kvm/svm.c
---- linux-2.6.32.45/arch/x86/kvm/svm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kvm/svm.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kvm/svm.c linux-2.6.32.46/arch/x86/kvm/svm.c
+--- linux-2.6.32.46/arch/x86/kvm/svm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kvm/svm.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2485,7 +2485,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
  
@@ -18698,9 +18703,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kvm/svm.c linux-2.6.32.45/arch/x86/kvm/svm.c
  	.cpu_has_kvm_support = has_svm,
  	.disabled_by_bios = is_disabled,
  	.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.32.45/arch/x86/kvm/vmx.c linux-2.6.32.45/arch/x86/kvm/vmx.c
---- linux-2.6.32.45/arch/x86/kvm/vmx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kvm/vmx.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kvm/vmx.c linux-2.6.32.46/arch/x86/kvm/vmx.c
+--- linux-2.6.32.46/arch/x86/kvm/vmx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kvm/vmx.c	2011-05-04 17:56:20.000000000 -0400
 @@ -570,7 +570,11 @@ static void reload_tss(void)
  
  	kvm_get_gdt(&gdt);
@@ -18791,9 +18796,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kvm/vmx.c linux-2.6.32.45/arch/x86/kvm/vmx.c
  	.cpu_has_kvm_support = cpu_has_kvm_support,
  	.disabled_by_bios = vmx_disabled_by_bios,
  	.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.32.45/arch/x86/kvm/x86.c linux-2.6.32.45/arch/x86/kvm/x86.c
---- linux-2.6.32.45/arch/x86/kvm/x86.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/kvm/x86.c	2011-05-10 22:12:26.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/kvm/x86.c linux-2.6.32.46/arch/x86/kvm/x86.c
+--- linux-2.6.32.46/arch/x86/kvm/x86.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kvm/x86.c	2011-05-10 22:12:26.000000000 -0400
 @@ -82,7 +82,7 @@ static void update_cr8_intercept(struct 
  static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
  				    struct kvm_cpuid_entry2 __user *entries);
@@ -18873,9 +18878,9 @@ diff -urNp linux-2.6.32.45/arch/x86/kvm/x86.c linux-2.6.32.45/arch/x86/kvm/x86.c
  
  	if (kvm_x86_ops) {
  		printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.32.45/arch/x86/lguest/boot.c linux-2.6.32.45/arch/x86/lguest/boot.c
---- linux-2.6.32.45/arch/x86/lguest/boot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lguest/boot.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lguest/boot.c linux-2.6.32.46/arch/x86/lguest/boot.c
+--- linux-2.6.32.46/arch/x86/lguest/boot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lguest/boot.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vt
   * Rebooting also tells the Host we're finished, but the RESTART flag tells the
   * Launcher to reboot us.
@@ -18888,9 +18893,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lguest/boot.c linux-2.6.32.45/arch/x86/lgues
  }
  
  /*G:050
-diff -urNp linux-2.6.32.45/arch/x86/lib/atomic64_32.c linux-2.6.32.45/arch/x86/lib/atomic64_32.c
---- linux-2.6.32.45/arch/x86/lib/atomic64_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/atomic64_32.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/atomic64_32.c linux-2.6.32.46/arch/x86/lib/atomic64_32.c
+--- linux-2.6.32.46/arch/x86/lib/atomic64_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/atomic64_32.c	2011-05-04 17:56:28.000000000 -0400
 @@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u6
  }
  EXPORT_SYMBOL(atomic64_cmpxchg);
@@ -19113,9 +19118,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/atomic64_32.c linux-2.6.32.45/arch/x86/l
   * atomic64_dec_and_test - decrement and test
   * @ptr: pointer to type atomic64_t
   *
-diff -urNp linux-2.6.32.45/arch/x86/lib/checksum_32.S linux-2.6.32.45/arch/x86/lib/checksum_32.S
---- linux-2.6.32.45/arch/x86/lib/checksum_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/checksum_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/checksum_32.S linux-2.6.32.46/arch/x86/lib/checksum_32.S
+--- linux-2.6.32.46/arch/x86/lib/checksum_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/checksum_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -19376,9 +19381,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/checksum_32.S linux-2.6.32.45/arch/x86/l
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-2.6.32.45/arch/x86/lib/clear_page_64.S linux-2.6.32.45/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.45/arch/x86/lib/clear_page_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/clear_page_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/clear_page_64.S linux-2.6.32.46/arch/x86/lib/clear_page_64.S
+--- linux-2.6.32.46/arch/x86/lib/clear_page_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/clear_page_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -19388,9 +19393,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/clear_page_64.S linux-2.6.32.45/arch/x86
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.45/arch/x86/lib/copy_page_64.S linux-2.6.32.45/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.45/arch/x86/lib/copy_page_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/copy_page_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/copy_page_64.S linux-2.6.32.46/arch/x86/lib/copy_page_64.S
+--- linux-2.6.32.46/arch/x86/lib/copy_page_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/copy_page_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -19400,9 +19405,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/copy_page_64.S linux-2.6.32.45/arch/x86/
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.45/arch/x86/lib/copy_user_64.S linux-2.6.32.45/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.45/arch/x86/lib/copy_user_64.S	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/copy_user_64.S	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_64.S linux-2.6.32.46/arch/x86/lib/copy_user_64.S
+--- linux-2.6.32.46/arch/x86/lib/copy_user_64.S	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/copy_user_64.S	2011-06-25 12:56:37.000000000 -0400
 @@ -15,13 +15,14 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -19471,9 +19476,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/copy_user_64.S linux-2.6.32.45/arch/x86/
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff -urNp linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/copy_user_nocache_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -19498,9 +19503,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.45/a
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff -urNp linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/csum-wrappers_64.c	2011-05-04 17:56:20.000000000 -0400
 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
@@ -19527,9 +19532,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.45/arch/
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff -urNp linux-2.6.32.45/arch/x86/lib/getuser.S linux-2.6.32.45/arch/x86/lib/getuser.S
---- linux-2.6.32.45/arch/x86/lib/getuser.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/getuser.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/getuser.S linux-2.6.32.46/arch/x86/lib/getuser.S
+--- linux-2.6.32.46/arch/x86/lib/getuser.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/getuser.S	2011-04-17 15:56:46.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -19635,9 +19640,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/getuser.S linux-2.6.32.45/arch/x86/lib/g
  4:	movq -7(%_ASM_AX),%_ASM_DX
  	xor %eax,%eax
  	ret
-diff -urNp linux-2.6.32.45/arch/x86/lib/memcpy_64.S linux-2.6.32.45/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.45/arch/x86/lib/memcpy_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/memcpy_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/memcpy_64.S linux-2.6.32.46/arch/x86/lib/memcpy_64.S
+--- linux-2.6.32.46/arch/x86/lib/memcpy_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/memcpy_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -128,7 +128,7 @@ ENDPROC(__memcpy)
  	 * It is also a lot simpler. Use this when possible:
  	 */
@@ -19647,9 +19652,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/memcpy_64.S linux-2.6.32.45/arch/x86/lib
  1:	.byte 0xeb				/* jmp <disp8> */
  	.byte (memcpy_c - memcpy) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.45/arch/x86/lib/memset_64.S linux-2.6.32.45/arch/x86/lib/memset_64.S
---- linux-2.6.32.45/arch/x86/lib/memset_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/memset_64.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/memset_64.S linux-2.6.32.46/arch/x86/lib/memset_64.S
+--- linux-2.6.32.46/arch/x86/lib/memset_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/memset_64.S	2011-04-17 15:56:46.000000000 -0400
 @@ -118,7 +118,7 @@ ENDPROC(__memset)
  
  #include <asm/cpufeature.h>
@@ -19659,9 +19664,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/memset_64.S linux-2.6.32.45/arch/x86/lib
  1:	.byte 0xeb				/* jmp <disp8> */
  	.byte (memset_c - memset) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-2.6.32.45/arch/x86/lib/mmx_32.c linux-2.6.32.45/arch/x86/lib/mmx_32.c
---- linux-2.6.32.45/arch/x86/lib/mmx_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/mmx_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/mmx_32.c linux-2.6.32.46/arch/x86/lib/mmx_32.c
+--- linux-2.6.32.46/arch/x86/lib/mmx_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/mmx_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
@@ -19977,9 +19982,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/mmx_32.c linux-2.6.32.45/arch/x86/lib/mm
  
  		from += 64;
  		to += 64;
-diff -urNp linux-2.6.32.45/arch/x86/lib/putuser.S linux-2.6.32.45/arch/x86/lib/putuser.S
---- linux-2.6.32.45/arch/x86/lib/putuser.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/putuser.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/putuser.S linux-2.6.32.46/arch/x86/lib/putuser.S
+--- linux-2.6.32.46/arch/x86/lib/putuser.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/putuser.S	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -20117,9 +20122,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/putuser.S linux-2.6.32.45/arch/x86/lib/p
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-2.6.32.45/arch/x86/lib/usercopy_32.c linux-2.6.32.45/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.45/arch/x86/lib/usercopy_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/usercopy_32.c	2011-04-23 21:12:28.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_32.c linux-2.6.32.46/arch/x86/lib/usercopy_32.c
+--- linux-2.6.32.46/arch/x86/lib/usercopy_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/usercopy_32.c	2011-04-23 21:12:28.000000000 -0400
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -20725,9 +20730,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/usercopy_32.c linux-2.6.32.45/arch/x86/l
 -EXPORT_SYMBOL(copy_from_user);
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-2.6.32.45/arch/x86/lib/usercopy_64.c linux-2.6.32.45/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.45/arch/x86/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/lib/usercopy_64.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_64.c linux-2.6.32.46/arch/x86/lib/usercopy_64.c
+--- linux-2.6.32.46/arch/x86/lib/usercopy_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/lib/usercopy_64.c	2011-05-04 17:56:20.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -20776,9 +20781,9 @@ diff -urNp linux-2.6.32.45/arch/x86/lib/usercopy_64.c linux-2.6.32.45/arch/x86/l
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.45/arch/x86/Makefile linux-2.6.32.45/arch/x86/Makefile
---- linux-2.6.32.45/arch/x86/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/Makefile	2011-07-19 18:16:02.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/Makefile linux-2.6.32.46/arch/x86/Makefile
+--- linux-2.6.32.46/arch/x86/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Makefile	2011-07-19 18:16:02.000000000 -0400
 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
  else
          BITS := 64
@@ -20800,9 +20805,9 @@ diff -urNp linux-2.6.32.45/arch/x86/Makefile linux-2.6.32.45/arch/x86/Makefile
 +
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.32.45/arch/x86/mm/extable.c linux-2.6.32.45/arch/x86/mm/extable.c
---- linux-2.6.32.45/arch/x86/mm/extable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/extable.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/extable.c linux-2.6.32.46/arch/x86/mm/extable.c
+--- linux-2.6.32.46/arch/x86/mm/extable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/extable.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1,14 +1,71 @@
  #include <linux/module.h>
  #include <linux/spinlock.h>
@@ -20876,9 +20881,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/extable.c linux-2.6.32.45/arch/x86/mm/ext
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.32.45/arch/x86/mm/fault.c linux-2.6.32.45/arch/x86/mm/fault.c
---- linux-2.6.32.45/arch/x86/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/fault.c	2011-08-17 20:06:44.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/fault.c linux-2.6.32.46/arch/x86/mm/fault.c
+--- linux-2.6.32.46/arch/x86/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/fault.c	2011-08-17 20:06:44.000000000 -0400
 @@ -11,10 +11,19 @@
  #include <linux/kprobes.h>		/* __kprobes, ...		*/
  #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
@@ -21565,9 +21570,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/fault.c linux-2.6.32.45/arch/x86/mm/fault
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-2.6.32.45/arch/x86/mm/gup.c linux-2.6.32.45/arch/x86/mm/gup.c
---- linux-2.6.32.45/arch/x86/mm/gup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/gup.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/gup.c linux-2.6.32.46/arch/x86/mm/gup.c
+--- linux-2.6.32.46/arch/x86/mm/gup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/gup.c	2011-04-17 15:56:46.000000000 -0400
 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -21577,9 +21582,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/gup.c linux-2.6.32.45/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-2.6.32.45/arch/x86/mm/highmem_32.c linux-2.6.32.45/arch/x86/mm/highmem_32.c
---- linux-2.6.32.45/arch/x86/mm/highmem_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/highmem_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/highmem_32.c linux-2.6.32.46/arch/x86/mm/highmem_32.c
+--- linux-2.6.32.46/arch/x86/mm/highmem_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/highmem_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -21591,9 +21596,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/highmem_32.c linux-2.6.32.45/arch/x86/mm/
  
  	return (void *)vaddr;
  }
-diff -urNp linux-2.6.32.45/arch/x86/mm/hugetlbpage.c linux-2.6.32.45/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.45/arch/x86/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/hugetlbpage.c linux-2.6.32.46/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.32.46/arch/x86/mm/hugetlbpage.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/hugetlbpage.c	2011-04-17 15:56:46.000000000 -0400
 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -21801,9 +21806,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/hugetlbpage.c linux-2.6.32.45/arch/x86/mm
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.32.45/arch/x86/mm/init_32.c linux-2.6.32.45/arch/x86/mm/init_32.c
---- linux-2.6.32.45/arch/x86/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/init_32.c linux-2.6.32.46/arch/x86/mm/init_32.c
+--- linux-2.6.32.46/arch/x86/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -22107,9 +22112,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/init_32.c linux-2.6.32.45/arch/x86/mm/ini
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff -urNp linux-2.6.32.45/arch/x86/mm/init_64.c linux-2.6.32.45/arch/x86/mm/init_64.c
---- linux-2.6.32.45/arch/x86/mm/init_64.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/init_64.c	2011-04-17 17:03:05.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/init_64.c linux-2.6.32.46/arch/x86/mm/init_64.c
+--- linux-2.6.32.46/arch/x86/mm/init_64.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/init_64.c	2011-04-17 17:03:05.000000000 -0400
 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
  	pmd = fill_pmd(pud, vaddr);
  	pte = fill_pte(pmd, vaddr);
@@ -22170,9 +22175,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/init_64.c linux-2.6.32.45/arch/x86/mm/ini
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-2.6.32.45/arch/x86/mm/init.c linux-2.6.32.45/arch/x86/mm/init.c
---- linux-2.6.32.45/arch/x86/mm/init.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/init.c	2011-06-07 19:06:09.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/init.c linux-2.6.32.46/arch/x86/mm/init.c
+--- linux-2.6.32.46/arch/x86/mm/init.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/init.c	2011-06-07 19:06:09.000000000 -0400
 @@ -69,11 +69,7 @@ static void __init find_early_table_spac
  	 * cause a hotspot and fill up ZONE_DMA. The page tables
  	 * need roughly 0.5KB per GB.
@@ -22310,9 +22315,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/init.c linux-2.6.32.45/arch/x86/mm/init.c
  	free_init_pages("unused kernel memory",
  			(unsigned long)(&__init_begin),
  			(unsigned long)(&__init_end));
-diff -urNp linux-2.6.32.45/arch/x86/mm/iomap_32.c linux-2.6.32.45/arch/x86/mm/iomap_32.c
---- linux-2.6.32.45/arch/x86/mm/iomap_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/iomap_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/iomap_32.c linux-2.6.32.46/arch/x86/mm/iomap_32.c
+--- linux-2.6.32.46/arch/x86/mm/iomap_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/iomap_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	debug_kmap_atomic(type);
  	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -22325,9 +22330,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/iomap_32.c linux-2.6.32.45/arch/x86/mm/io
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-2.6.32.45/arch/x86/mm/ioremap.c linux-2.6.32.45/arch/x86/mm/ioremap.c
---- linux-2.6.32.45/arch/x86/mm/ioremap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/ioremap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/ioremap.c linux-2.6.32.46/arch/x86/mm/ioremap.c
+--- linux-2.6.32.46/arch/x86/mm/ioremap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/ioremap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
  	 * Second special case: Some BIOSen report the PC BIOS
  	 * area (640->1Mb) as ram even though it is not.
@@ -22374,9 +22379,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/ioremap.c linux-2.6.32.45/arch/x86/mm/ior
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/kmemcheck/kmemcheck.c	2011-04-17 15:56:46.000000000 -0400
 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
  	 * memory (e.g. tracked pages)? For now, we need this to avoid
  	 * invoking kmemcheck for PnP BIOS calls.
@@ -22389,9 +22394,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.45/arc
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.32.45/arch/x86/mm/mmap.c linux-2.6.32.45/arch/x86/mm/mmap.c
---- linux-2.6.32.45/arch/x86/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/mmap.c linux-2.6.32.46/arch/x86/mm/mmap.c
+--- linux-2.6.32.46/arch/x86/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -22473,9 +22478,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/mmap.c linux-2.6.32.45/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-2.6.32.45/arch/x86/mm/mmio-mod.c linux-2.6.32.45/arch/x86/mm/mmio-mod.c
---- linux-2.6.32.45/arch/x86/mm/mmio-mod.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/mmio-mod.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/mmio-mod.c linux-2.6.32.46/arch/x86/mm/mmio-mod.c
+--- linux-2.6.32.46/arch/x86/mm/mmio-mod.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/mmio-mod.c	2011-07-06 19:53:33.000000000 -0400
 @@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, s
  		break;
  	default:
@@ -22503,9 +22508,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/mmio-mod.c linux-2.6.32.45/arch/x86/mm/mm
  	};
  	map.map_id = trace->id;
  
-diff -urNp linux-2.6.32.45/arch/x86/mm/numa_32.c linux-2.6.32.45/arch/x86/mm/numa_32.c
---- linux-2.6.32.45/arch/x86/mm/numa_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/numa_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/numa_32.c linux-2.6.32.46/arch/x86/mm/numa_32.c
+--- linux-2.6.32.46/arch/x86/mm/numa_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/numa_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
  }
  #endif
@@ -22514,9 +22519,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/numa_32.c linux-2.6.32.45/arch/x86/mm/num
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.32.45/arch/x86/mm/pageattr.c linux-2.6.32.45/arch/x86/mm/pageattr.c
---- linux-2.6.32.45/arch/x86/mm/pageattr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/pageattr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr.c linux-2.6.32.46/arch/x86/mm/pageattr.c
+--- linux-2.6.32.46/arch/x86/mm/pageattr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pageattr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -261,16 +261,17 @@ static inline pgprot_t static_protection
  	 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
  	 */
@@ -22593,9 +22598,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/pageattr.c linux-2.6.32.45/arch/x86/mm/pa
  }
  
  static int
-diff -urNp linux-2.6.32.45/arch/x86/mm/pageattr-test.c linux-2.6.32.45/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.45/arch/x86/mm/pageattr-test.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/pageattr-test.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr-test.c linux-2.6.32.46/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.46/arch/x86/mm/pageattr-test.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pageattr-test.c	2011-04-17 15:56:46.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -22605,9 +22610,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/pageattr-test.c linux-2.6.32.45/arch/x86/
  }
  
  struct split_state {
-diff -urNp linux-2.6.32.45/arch/x86/mm/pat.c linux-2.6.32.45/arch/x86/mm/pat.c
---- linux-2.6.32.45/arch/x86/mm/pat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/pat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/pat.c linux-2.6.32.46/arch/x86/mm/pat.c
+--- linux-2.6.32.46/arch/x86/mm/pat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
  
   conflict:
@@ -22655,9 +22660,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/pat.c linux-2.6.32.45/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.45/arch/x86/mm/pf_in.c linux-2.6.32.45/arch/x86/mm/pf_in.c
---- linux-2.6.32.45/arch/x86/mm/pf_in.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/pf_in.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/pf_in.c linux-2.6.32.46/arch/x86/mm/pf_in.c
+--- linux-2.6.32.46/arch/x86/mm/pf_in.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pf_in.c	2011-07-06 19:53:33.000000000 -0400
 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
  	int i;
  	enum reason_type rv = OTHERS;
@@ -22703,9 +22708,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/pf_in.c linux-2.6.32.45/arch/x86/mm/pf_in
  	p += skip_prefix(p, &prf);
  	p += get_opcode(p, &opcode);
  	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-2.6.32.45/arch/x86/mm/pgtable_32.c linux-2.6.32.45/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.45/arch/x86/mm/pgtable_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/pgtable_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable_32.c linux-2.6.32.46/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.46/arch/x86/mm/pgtable_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pgtable_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 
  		return;
  	}
@@ -22720,9 +22725,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/pgtable_32.c linux-2.6.32.45/arch/x86/mm/
  
  	/*
  	 * It's enough to flush this one mapping.
-diff -urNp linux-2.6.32.45/arch/x86/mm/pgtable.c linux-2.6.32.45/arch/x86/mm/pgtable.c
---- linux-2.6.32.45/arch/x86/mm/pgtable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/pgtable.c	2011-05-11 18:25:15.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable.c linux-2.6.32.46/arch/x86/mm/pgtable.c
+--- linux-2.6.32.46/arch/x86/mm/pgtable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pgtable.c	2011-05-11 18:25:15.000000000 -0400
 @@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
@@ -22969,9 +22974,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/pgtable.c linux-2.6.32.45/arch/x86/mm/pgt
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-2.6.32.45/arch/x86/mm/setup_nx.c linux-2.6.32.45/arch/x86/mm/setup_nx.c
---- linux-2.6.32.45/arch/x86/mm/setup_nx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/setup_nx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/setup_nx.c linux-2.6.32.46/arch/x86/mm/setup_nx.c
+--- linux-2.6.32.46/arch/x86/mm/setup_nx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/setup_nx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -4,11 +4,10 @@
  
  #include <asm/pgtable.h>
@@ -23037,9 +23042,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/setup_nx.c linux-2.6.32.45/arch/x86/mm/se
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  #endif
-diff -urNp linux-2.6.32.45/arch/x86/mm/tlb.c linux-2.6.32.45/arch/x86/mm/tlb.c
---- linux-2.6.32.45/arch/x86/mm/tlb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/mm/tlb.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/mm/tlb.c linux-2.6.32.46/arch/x86/mm/tlb.c
+--- linux-2.6.32.46/arch/x86/mm/tlb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/tlb.c	2011-04-23 12:56:10.000000000 -0400
 @@ -61,7 +61,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -23052,9 +23057,9 @@ diff -urNp linux-2.6.32.45/arch/x86/mm/tlb.c linux-2.6.32.45/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-2.6.32.45/arch/x86/oprofile/backtrace.c linux-2.6.32.45/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.45/arch/x86/oprofile/backtrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/oprofile/backtrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/oprofile/backtrace.c linux-2.6.32.46/arch/x86/oprofile/backtrace.c
+--- linux-2.6.32.46/arch/x86/oprofile/backtrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/oprofile/backtrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
  	struct frame_head bufhead[2];
  
@@ -23073,9 +23078,9 @@ diff -urNp linux-2.6.32.45/arch/x86/oprofile/backtrace.c linux-2.6.32.45/arch/x8
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/oprofile/op_model_p4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
  #endif
  }
@@ -23085,9 +23090,9 @@ diff -urNp linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c linux-2.6.32.45/arch/
  {
  #ifdef CONFIG_SMP
  	return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.32.45/arch/x86/pci/common.c linux-2.6.32.45/arch/x86/pci/common.c
---- linux-2.6.32.45/arch/x86/pci/common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/common.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/common.c linux-2.6.32.46/arch/x86/pci/common.c
+--- linux-2.6.32.46/arch/x86/pci/common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/common.c	2011-04-23 12:56:10.000000000 -0400
 @@ -31,8 +31,8 @@ int noioapicreroute = 1;
  int pcibios_last_bus = -1;
  unsigned long pirq_table_addr;
@@ -23099,9 +23104,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/common.c linux-2.6.32.45/arch/x86/pci/co
  
  int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
  						int reg, int len, u32 *val)
-diff -urNp linux-2.6.32.45/arch/x86/pci/direct.c linux-2.6.32.45/arch/x86/pci/direct.c
---- linux-2.6.32.45/arch/x86/pci/direct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/direct.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/direct.c linux-2.6.32.46/arch/x86/pci/direct.c
+--- linux-2.6.32.46/arch/x86/pci/direct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/direct.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 
  
  #undef PCI_CONF1_ADDRESS
@@ -23129,9 +23134,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/direct.c linux-2.6.32.45/arch/x86/pci/di
  {
  	u32 x = 0;
  	int year, devfn;
-diff -urNp linux-2.6.32.45/arch/x86/pci/mmconfig_32.c linux-2.6.32.45/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.45/arch/x86/pci/mmconfig_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/mmconfig_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_32.c linux-2.6.32.46/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.32.46/arch/x86/pci/mmconfig_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/mmconfig_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 
  	return 0;
  }
@@ -23141,9 +23146,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/mmconfig_32.c linux-2.6.32.45/arch/x86/p
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.32.45/arch/x86/pci/mmconfig_64.c linux-2.6.32.45/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.45/arch/x86/pci/mmconfig_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/mmconfig_64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/mmconfig_64.c linux-2.6.32.46/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.32.46/arch/x86/pci/mmconfig_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/mmconfig_64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 
  	return 0;
  }
@@ -23153,9 +23158,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/mmconfig_64.c linux-2.6.32.45/arch/x86/p
  	.read =		pci_mmcfg_read,
  	.write =	pci_mmcfg_write,
  };
-diff -urNp linux-2.6.32.45/arch/x86/pci/numaq_32.c linux-2.6.32.45/arch/x86/pci/numaq_32.c
---- linux-2.6.32.45/arch/x86/pci/numaq_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/numaq_32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/numaq_32.c linux-2.6.32.46/arch/x86/pci/numaq_32.c
+--- linux-2.6.32.46/arch/x86/pci/numaq_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/numaq_32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
  
  #undef PCI_CONF1_MQ_ADDRESS
@@ -23165,9 +23170,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/numaq_32.c linux-2.6.32.45/arch/x86/pci/
  	.read	= pci_conf1_mq_read,
  	.write	= pci_conf1_mq_write
  };
-diff -urNp linux-2.6.32.45/arch/x86/pci/olpc.c linux-2.6.32.45/arch/x86/pci/olpc.c
---- linux-2.6.32.45/arch/x86/pci/olpc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/olpc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/olpc.c linux-2.6.32.46/arch/x86/pci/olpc.c
+--- linux-2.6.32.46/arch/x86/pci/olpc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/olpc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
  	return 0;
  }
@@ -23177,9 +23182,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/olpc.c linux-2.6.32.45/arch/x86/pci/olpc
  	.read =	pci_olpc_read,
  	.write = pci_olpc_write,
  };
-diff -urNp linux-2.6.32.45/arch/x86/pci/pcbios.c linux-2.6.32.45/arch/x86/pci/pcbios.c
---- linux-2.6.32.45/arch/x86/pci/pcbios.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/pci/pcbios.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/pci/pcbios.c linux-2.6.32.46/arch/x86/pci/pcbios.c
+--- linux-2.6.32.46/arch/x86/pci/pcbios.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/pci/pcbios.c	2011-04-17 15:56:46.000000000 -0400
 @@ -56,50 +56,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -23502,9 +23507,9 @@ diff -urNp linux-2.6.32.45/arch/x86/pci/pcbios.c linux-2.6.32.45/arch/x86/pci/pc
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.32.45/arch/x86/power/cpu.c linux-2.6.32.45/arch/x86/power/cpu.c
---- linux-2.6.32.45/arch/x86/power/cpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/power/cpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/power/cpu.c linux-2.6.32.46/arch/x86/power/cpu.c
+--- linux-2.6.32.46/arch/x86/power/cpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/power/cpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -129,7 +129,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -23524,9 +23529,9 @@ diff -urNp linux-2.6.32.45/arch/x86/power/cpu.c linux-2.6.32.45/arch/x86/power/c
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-2.6.32.45/arch/x86/vdso/Makefile linux-2.6.32.45/arch/x86/vdso/Makefile
---- linux-2.6.32.45/arch/x86/vdso/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/vdso/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/vdso/Makefile linux-2.6.32.46/arch/x86/vdso/Makefile
+--- linux-2.6.32.46/arch/x86/vdso/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO    $@
  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -23536,9 +23541,9 @@ diff -urNp linux-2.6.32.45/arch/x86/vdso/Makefile linux-2.6.32.45/arch/x86/vdso/
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c	2011-04-17 15:56:46.000000000 -0400
 @@ -22,24 +22,48 @@
  #include <asm/hpet.h>
  #include <asm/unistd.h>
@@ -23637,9 +23642,9 @@ diff -urNp linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c linux-2.6.32.45/arch/x
  }
  int gettimeofday(struct timeval *, struct timezone *)
  	__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c	2011-04-23 12:56:10.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -23722,9 +23727,9 @@ diff -urNp linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c linux-2.6.32.45/arch/x86
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-2.6.32.45/arch/x86/vdso/vdso.lds.S linux-2.6.32.45/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.45/arch/x86/vdso/vdso.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/vdso/vdso.lds.S	2011-06-06 17:35:35.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso.lds.S linux-2.6.32.46/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.46/arch/x86/vdso/vdso.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/vdso.lds.S	2011-06-06 17:35:35.000000000 -0400
 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
  #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
  #include "vextern.h"
@@ -23735,9 +23740,9 @@ diff -urNp linux-2.6.32.45/arch/x86/vdso/vdso.lds.S linux-2.6.32.45/arch/x86/vds
 +VEXTERN(fallback_time)
 +VEXTERN(getcpu)
 +#undef	VEXTERN
-diff -urNp linux-2.6.32.45/arch/x86/vdso/vextern.h linux-2.6.32.45/arch/x86/vdso/vextern.h
---- linux-2.6.32.45/arch/x86/vdso/vextern.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/vdso/vextern.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/vdso/vextern.h linux-2.6.32.46/arch/x86/vdso/vextern.h
+--- linux-2.6.32.46/arch/x86/vdso/vextern.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/vextern.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,5 @@
     put into vextern.h and be referenced as a pointer with vdso prefix.
     The main kernel later fills in the values.   */
@@ -23745,9 +23750,9 @@ diff -urNp linux-2.6.32.45/arch/x86/vdso/vextern.h linux-2.6.32.45/arch/x86/vdso
 -VEXTERN(jiffies)
  VEXTERN(vgetcpu_mode)
  VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.32.45/arch/x86/vdso/vma.c linux-2.6.32.45/arch/x86/vdso/vma.c
---- linux-2.6.32.45/arch/x86/vdso/vma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/vdso/vma.c	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/vdso/vma.c linux-2.6.32.46/arch/x86/vdso/vma.c
+--- linux-2.6.32.46/arch/x86/vdso/vma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/vma.c	2011-08-23 20:24:19.000000000 -0400
 @@ -17,8 +17,6 @@
  #include "vextern.h"		/* Just for VMAGIC.  */
  #undef VEXTERN
@@ -23835,9 +23840,9 @@ diff -urNp linux-2.6.32.45/arch/x86/vdso/vma.c linux-2.6.32.45/arch/x86/vdso/vma
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.32.45/arch/x86/xen/enlighten.c linux-2.6.32.45/arch/x86/xen/enlighten.c
---- linux-2.6.32.45/arch/x86/xen/enlighten.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/xen/enlighten.c	2011-05-22 23:02:03.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/xen/enlighten.c linux-2.6.32.46/arch/x86/xen/enlighten.c
+--- linux-2.6.32.46/arch/x86/xen/enlighten.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/xen/enlighten.c	2011-05-22 23:02:03.000000000 -0400
 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -23923,9 +23928,9 @@ diff -urNp linux-2.6.32.45/arch/x86/xen/enlighten.c linux-2.6.32.45/arch/x86/xen
  	xen_smp_init();
  
  	pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.32.45/arch/x86/xen/mmu.c linux-2.6.32.45/arch/x86/xen/mmu.c
---- linux-2.6.32.45/arch/x86/xen/mmu.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/xen/mmu.c	2011-08-24 18:35:52.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/xen/mmu.c linux-2.6.32.46/arch/x86/xen/mmu.c
+--- linux-2.6.32.46/arch/x86/xen/mmu.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/arch/x86/xen/mmu.c	2011-08-24 18:35:52.000000000 -0400
 @@ -1719,6 +1719,8 @@ __init pgd_t *xen_setup_kernel_pagetable
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
@@ -23962,9 +23967,9 @@ diff -urNp linux-2.6.32.45/arch/x86/xen/mmu.c linux-2.6.32.45/arch/x86/xen/mmu.c
  
  	.alloc_pud = xen_alloc_pmd_init,
  	.release_pud = xen_release_pmd_init,
-diff -urNp linux-2.6.32.45/arch/x86/xen/smp.c linux-2.6.32.45/arch/x86/xen/smp.c
---- linux-2.6.32.45/arch/x86/xen/smp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/xen/smp.c	2011-05-11 18:25:15.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/xen/smp.c linux-2.6.32.46/arch/x86/xen/smp.c
+--- linux-2.6.32.46/arch/x86/xen/smp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/xen/smp.c	2011-05-11 18:25:15.000000000 -0400
 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
@@ -24009,9 +24014,9 @@ diff -urNp linux-2.6.32.45/arch/x86/xen/smp.c linux-2.6.32.45/arch/x86/xen/smp.c
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-2.6.32.45/arch/x86/xen/xen-asm_32.S linux-2.6.32.45/arch/x86/xen/xen-asm_32.S
---- linux-2.6.32.45/arch/x86/xen/xen-asm_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/xen/xen-asm_32.S	2011-04-22 19:13:13.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/xen/xen-asm_32.S linux-2.6.32.46/arch/x86/xen/xen-asm_32.S
+--- linux-2.6.32.46/arch/x86/xen/xen-asm_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/xen/xen-asm_32.S	2011-04-22 19:13:13.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -24033,9 +24038,9 @@ diff -urNp linux-2.6.32.45/arch/x86/xen/xen-asm_32.S linux-2.6.32.45/arch/x86/xe
  #else
  	movl per_cpu__xen_vcpu, %eax
  #endif
-diff -urNp linux-2.6.32.45/arch/x86/xen/xen-head.S linux-2.6.32.45/arch/x86/xen/xen-head.S
---- linux-2.6.32.45/arch/x86/xen/xen-head.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/xen/xen-head.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/xen/xen-head.S linux-2.6.32.46/arch/x86/xen/xen-head.S
+--- linux-2.6.32.46/arch/x86/xen/xen-head.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/xen/xen-head.S	2011-04-17 15:56:46.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -24054,9 +24059,9 @@ diff -urNp linux-2.6.32.45/arch/x86/xen/xen-head.S linux-2.6.32.45/arch/x86/xen/
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.32.45/arch/x86/xen/xen-ops.h linux-2.6.32.45/arch/x86/xen/xen-ops.h
---- linux-2.6.32.45/arch/x86/xen/xen-ops.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/arch/x86/xen/xen-ops.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/arch/x86/xen/xen-ops.h linux-2.6.32.46/arch/x86/xen/xen-ops.h
+--- linux-2.6.32.46/arch/x86/xen/xen-ops.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/xen/xen-ops.h	2011-04-17 15:56:46.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -24066,9 +24071,9 @@ diff -urNp linux-2.6.32.45/arch/x86/xen/xen-ops.h linux-2.6.32.45/arch/x86/xen/x
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-2.6.32.45/block/blk-integrity.c linux-2.6.32.45/block/blk-integrity.c
---- linux-2.6.32.45/block/blk-integrity.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/blk-integrity.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/block/blk-integrity.c linux-2.6.32.46/block/blk-integrity.c
+--- linux-2.6.32.46/block/blk-integrity.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/blk-integrity.c	2011-04-17 15:56:46.000000000 -0400
 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
  	NULL,
  };
@@ -24078,9 +24083,9 @@ diff -urNp linux-2.6.32.45/block/blk-integrity.c linux-2.6.32.45/block/blk-integ
  	.show	= &integrity_attr_show,
  	.store	= &integrity_attr_store,
  };
-diff -urNp linux-2.6.32.45/block/blk-iopoll.c linux-2.6.32.45/block/blk-iopoll.c
---- linux-2.6.32.45/block/blk-iopoll.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/blk-iopoll.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/block/blk-iopoll.c linux-2.6.32.46/block/blk-iopoll.c
+--- linux-2.6.32.46/block/blk-iopoll.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/blk-iopoll.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -24090,9 +24095,9 @@ diff -urNp linux-2.6.32.45/block/blk-iopoll.c linux-2.6.32.45/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.32.45/block/blk-map.c linux-2.6.32.45/block/blk-map.c
---- linux-2.6.32.45/block/blk-map.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/blk-map.c	2011-04-18 16:57:33.000000000 -0400
+diff -urNp linux-2.6.32.46/block/blk-map.c linux-2.6.32.46/block/blk-map.c
+--- linux-2.6.32.46/block/blk-map.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/blk-map.c	2011-04-18 16:57:33.000000000 -0400
 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
  	 * direct dma. else, set up kernel bounce buffers
  	 */
@@ -24127,9 +24132,9 @@ diff -urNp linux-2.6.32.45/block/blk-map.c linux-2.6.32.45/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-2.6.32.45/block/blk-softirq.c linux-2.6.32.45/block/blk-softirq.c
---- linux-2.6.32.45/block/blk-softirq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/blk-softirq.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/block/blk-softirq.c linux-2.6.32.46/block/blk-softirq.c
+--- linux-2.6.32.46/block/blk-softirq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/blk-softirq.c	2011-04-17 15:56:46.000000000 -0400
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -24139,9 +24144,9 @@ diff -urNp linux-2.6.32.45/block/blk-softirq.c linux-2.6.32.45/block/blk-softirq
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-2.6.32.45/block/blk-sysfs.c linux-2.6.32.45/block/blk-sysfs.c
---- linux-2.6.32.45/block/blk-sysfs.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/block/blk-sysfs.c	2011-05-10 22:12:26.000000000 -0400
+diff -urNp linux-2.6.32.46/block/blk-sysfs.c linux-2.6.32.46/block/blk-sysfs.c
+--- linux-2.6.32.46/block/blk-sysfs.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/block/blk-sysfs.c	2011-05-10 22:12:26.000000000 -0400
 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
  	kmem_cache_free(blk_requestq_cachep, q);
  }
@@ -24151,9 +24156,9 @@ diff -urNp linux-2.6.32.45/block/blk-sysfs.c linux-2.6.32.45/block/blk-sysfs.c
  	.show	= queue_attr_show,
  	.store	= queue_attr_store,
  };
-diff -urNp linux-2.6.32.45/block/bsg.c linux-2.6.32.45/block/bsg.c
---- linux-2.6.32.45/block/bsg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/bsg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/block/bsg.c linux-2.6.32.46/block/bsg.c
+--- linux-2.6.32.46/block/bsg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/bsg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
  				struct sg_io_v4 *hdr, struct bsg_device *bd,
  				fmode_t has_write_perm)
@@ -24181,9 +24186,9 @@ diff -urNp linux-2.6.32.45/block/bsg.c linux-2.6.32.45/block/bsg.c
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-diff -urNp linux-2.6.32.45/block/elevator.c linux-2.6.32.45/block/elevator.c
---- linux-2.6.32.45/block/elevator.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/elevator.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/block/elevator.c linux-2.6.32.46/block/elevator.c
+--- linux-2.6.32.46/block/elevator.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/elevator.c	2011-04-17 15:56:46.000000000 -0400
 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
  	return error;
  }
@@ -24193,9 +24198,9 @@ diff -urNp linux-2.6.32.45/block/elevator.c linux-2.6.32.45/block/elevator.c
  	.show	= elv_attr_show,
  	.store	= elv_attr_store,
  };
-diff -urNp linux-2.6.32.45/block/scsi_ioctl.c linux-2.6.32.45/block/scsi_ioctl.c
---- linux-2.6.32.45/block/scsi_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/block/scsi_ioctl.c	2011-04-23 13:28:22.000000000 -0400
+diff -urNp linux-2.6.32.46/block/scsi_ioctl.c linux-2.6.32.46/block/scsi_ioctl.c
+--- linux-2.6.32.46/block/scsi_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/block/scsi_ioctl.c	2011-04-23 13:28:22.000000000 -0400
 @@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -24247,9 +24252,9 @@ diff -urNp linux-2.6.32.45/block/scsi_ioctl.c linux-2.6.32.45/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-2.6.32.45/crypto/cryptd.c linux-2.6.32.45/crypto/cryptd.c
---- linux-2.6.32.45/crypto/cryptd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/crypto/cryptd.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/crypto/cryptd.c linux-2.6.32.46/crypto/cryptd.c
+--- linux-2.6.32.46/crypto/cryptd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/crypto/cryptd.c	2011-08-23 21:22:32.000000000 -0400
 @@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx {
  
  struct cryptd_blkcipher_request_ctx {
@@ -24259,9 +24264,9 @@ diff -urNp linux-2.6.32.45/crypto/cryptd.c linux-2.6.32.45/crypto/cryptd.c
  
  struct cryptd_hash_ctx {
  	struct crypto_shash *child;
-diff -urNp linux-2.6.32.45/crypto/gf128mul.c linux-2.6.32.45/crypto/gf128mul.c
---- linux-2.6.32.45/crypto/gf128mul.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/crypto/gf128mul.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/crypto/gf128mul.c linux-2.6.32.46/crypto/gf128mul.c
+--- linux-2.6.32.46/crypto/gf128mul.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/crypto/gf128mul.c	2011-07-06 19:53:33.000000000 -0400
 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
  	for (i = 0; i < 7; ++i)
  		gf128mul_x_lle(&p[i + 1], &p[i]);
@@ -24280,9 +24285,9 @@ diff -urNp linux-2.6.32.45/crypto/gf128mul.c linux-2.6.32.45/crypto/gf128mul.c
  	for (i = 0;;) {
  		u8 ch = ((u8 *)b)[i];
  
-diff -urNp linux-2.6.32.45/crypto/serpent.c linux-2.6.32.45/crypto/serpent.c
---- linux-2.6.32.45/crypto/serpent.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/crypto/serpent.c	2011-08-18 23:59:56.000000000 -0400
+diff -urNp linux-2.6.32.46/crypto/serpent.c linux-2.6.32.46/crypto/serpent.c
+--- linux-2.6.32.46/crypto/serpent.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/crypto/serpent.c	2011-08-18 23:59:56.000000000 -0400
 @@ -21,6 +21,7 @@
  #include <asm/byteorder.h>
  #include <linux/crypto.h>
@@ -24300,9 +24305,9 @@ diff -urNp linux-2.6.32.45/crypto/serpent.c linux-2.6.32.45/crypto/serpent.c
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff -urNp linux-2.6.32.45/Documentation/dontdiff linux-2.6.32.45/Documentation/dontdiff
---- linux-2.6.32.45/Documentation/dontdiff	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/Documentation/dontdiff	2011-08-21 18:59:02.000000000 -0400
+diff -urNp linux-2.6.32.46/Documentation/dontdiff linux-2.6.32.46/Documentation/dontdiff
+--- linux-2.6.32.46/Documentation/dontdiff	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/Documentation/dontdiff	2011-08-21 18:59:02.000000000 -0400
 @@ -1,13 +1,16 @@
  *.a
  *.aux
@@ -24438,9 +24443,9 @@ diff -urNp linux-2.6.32.45/Documentation/dontdiff linux-2.6.32.45/Documentation/
  zImage*
  zconf.hash.c
 +zoffset.h
-diff -urNp linux-2.6.32.45/Documentation/kernel-parameters.txt linux-2.6.32.45/Documentation/kernel-parameters.txt
---- linux-2.6.32.45/Documentation/kernel-parameters.txt	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/Documentation/kernel-parameters.txt	2011-04-17 15:56:45.000000000 -0400
+diff -urNp linux-2.6.32.46/Documentation/kernel-parameters.txt linux-2.6.32.46/Documentation/kernel-parameters.txt
+--- linux-2.6.32.46/Documentation/kernel-parameters.txt	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/Documentation/kernel-parameters.txt	2011-04-17 15:56:45.000000000 -0400
 @@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. 
  			the specified number of seconds.  This is to be used if
  			your oopses keep scrolling off the screen.
@@ -24455,9 +24460,9 @@ diff -urNp linux-2.6.32.45/Documentation/kernel-parameters.txt linux-2.6.32.45/D
  	pcbit=		[HW,ISDN]
  
  	pcd.		[PARIDE]
-diff -urNp linux-2.6.32.45/drivers/acpi/acpi_pad.c linux-2.6.32.45/drivers/acpi/acpi_pad.c
---- linux-2.6.32.45/drivers/acpi/acpi_pad.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/acpi_pad.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/acpi_pad.c linux-2.6.32.46/drivers/acpi/acpi_pad.c
+--- linux-2.6.32.46/drivers/acpi/acpi_pad.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/acpi_pad.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,7 +30,7 @@
  #include <acpi/acpi_bus.h>
  #include <acpi/acpi_drivers.h>
@@ -24467,9 +24472,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/acpi_pad.c linux-2.6.32.45/drivers/acpi/
  #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
  #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
  static DEFINE_MUTEX(isolated_cpus_lock);
-diff -urNp linux-2.6.32.45/drivers/acpi/battery.c linux-2.6.32.45/drivers/acpi/battery.c
---- linux-2.6.32.45/drivers/acpi/battery.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/battery.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/battery.c linux-2.6.32.46/drivers/acpi/battery.c
+--- linux-2.6.32.46/drivers/acpi/battery.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/battery.c	2011-04-17 15:56:46.000000000 -0400
 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
  	}
  
@@ -24479,9 +24484,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/battery.c linux-2.6.32.45/drivers/acpi/b
  	mode_t mode;
  	const char *name;
  } acpi_battery_file[] = {
-diff -urNp linux-2.6.32.45/drivers/acpi/dock.c linux-2.6.32.45/drivers/acpi/dock.c
---- linux-2.6.32.45/drivers/acpi/dock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/dock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/dock.c linux-2.6.32.46/drivers/acpi/dock.c
+--- linux-2.6.32.46/drivers/acpi/dock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/dock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ struct dock_dependent_device {
  	struct list_head list;
  	struct list_head hotplug_list;
@@ -24500,9 +24505,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/dock.c linux-2.6.32.45/drivers/acpi/dock
  			     void *context)
  {
  	struct dock_dependent_device *dd;
-diff -urNp linux-2.6.32.45/drivers/acpi/osl.c linux-2.6.32.45/drivers/acpi/osl.c
---- linux-2.6.32.45/drivers/acpi/osl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/osl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/osl.c linux-2.6.32.46/drivers/acpi/osl.c
+--- linux-2.6.32.46/drivers/acpi/osl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/osl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
  	void __iomem *virt_addr;
  
@@ -24521,9 +24526,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/osl.c linux-2.6.32.45/drivers/acpi/osl.c
  
  	switch (width) {
  	case 8:
-diff -urNp linux-2.6.32.45/drivers/acpi/power_meter.c linux-2.6.32.45/drivers/acpi/power_meter.c
---- linux-2.6.32.45/drivers/acpi/power_meter.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/power_meter.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/power_meter.c linux-2.6.32.46/drivers/acpi/power_meter.c
+--- linux-2.6.32.46/drivers/acpi/power_meter.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/power_meter.c	2011-04-17 15:56:46.000000000 -0400
 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
  		return res;
  
@@ -24533,9 +24538,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/power_meter.c linux-2.6.32.45/drivers/ac
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.32.45/drivers/acpi/proc.c linux-2.6.32.45/drivers/acpi/proc.c
---- linux-2.6.32.45/drivers/acpi/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/proc.c linux-2.6.32.46/drivers/acpi/proc.c
+--- linux-2.6.32.46/drivers/acpi/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
@@ -24571,9 +24576,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/proc.c linux-2.6.32.45/drivers/acpi/proc
  			dev->wakeup.state.enabled =
  			    dev->wakeup.state.enabled ? 0 : 1;
  			found_dev = dev;
-diff -urNp linux-2.6.32.45/drivers/acpi/processor_core.c linux-2.6.32.45/drivers/acpi/processor_core.c
---- linux-2.6.32.45/drivers/acpi/processor_core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/processor_core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/processor_core.c linux-2.6.32.46/drivers/acpi/processor_core.c
+--- linux-2.6.32.46/drivers/acpi/processor_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/processor_core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  	}
@@ -24583,9 +24588,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/processor_core.c linux-2.6.32.45/drivers
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-2.6.32.45/drivers/acpi/sbshc.c linux-2.6.32.45/drivers/acpi/sbshc.c
---- linux-2.6.32.45/drivers/acpi/sbshc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/sbshc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/sbshc.c linux-2.6.32.46/drivers/acpi/sbshc.c
+--- linux-2.6.32.46/drivers/acpi/sbshc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/sbshc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -17,7 +17,7 @@
  
  #define PREFIX "ACPI: "
@@ -24595,9 +24600,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/sbshc.c linux-2.6.32.45/drivers/acpi/sbs
  #define ACPI_SMB_HC_DEVICE_NAME	"ACPI SMBus HC"
  
  struct acpi_smb_hc {
-diff -urNp linux-2.6.32.45/drivers/acpi/sleep.c linux-2.6.32.45/drivers/acpi/sleep.c
---- linux-2.6.32.45/drivers/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/sleep.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/sleep.c linux-2.6.32.46/drivers/acpi/sleep.c
+--- linux-2.6.32.46/drivers/acpi/sleep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/sleep.c	2011-04-17 15:56:46.000000000 -0400
 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
  	}
  }
@@ -24634,9 +24639,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/sleep.c linux-2.6.32.45/drivers/acpi/sle
  	.begin = acpi_hibernation_begin_old,
  	.end = acpi_pm_end,
  	.pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.32.45/drivers/acpi/video.c linux-2.6.32.45/drivers/acpi/video.c
---- linux-2.6.32.45/drivers/acpi/video.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/acpi/video.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/acpi/video.c linux-2.6.32.46/drivers/acpi/video.c
+--- linux-2.6.32.46/drivers/acpi/video.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/acpi/video.c	2011-04-17 15:56:46.000000000 -0400
 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
  				vd->brightness->levels[request_level]);
  }
@@ -24646,9 +24651,9 @@ diff -urNp linux-2.6.32.45/drivers/acpi/video.c linux-2.6.32.45/drivers/acpi/vid
  	.get_brightness = acpi_video_get_brightness,
  	.update_status  = acpi_video_set_brightness,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/ahci.c linux-2.6.32.45/drivers/ata/ahci.c
---- linux-2.6.32.45/drivers/ata/ahci.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/ahci.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/ahci.c linux-2.6.32.46/drivers/ata/ahci.c
+--- linux-2.6.32.46/drivers/ata/ahci.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/ahci.c	2011-04-23 12:56:10.000000000 -0400
 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
  	.sdev_attrs		= ahci_sdev_attrs,
  };
@@ -24679,9 +24684,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/ahci.c linux-2.6.32.45/drivers/ata/ahci.c
  	.inherits		= &ahci_ops,
  	.softreset		= ahci_sb600_softreset,
  	.pmp_softreset		= ahci_sb600_softreset,
-diff -urNp linux-2.6.32.45/drivers/ata/ata_generic.c linux-2.6.32.45/drivers/ata/ata_generic.c
---- linux-2.6.32.45/drivers/ata/ata_generic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/ata_generic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/ata_generic.c linux-2.6.32.46/drivers/ata/ata_generic.c
+--- linux-2.6.32.46/drivers/ata/ata_generic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/ata_generic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -104,7 +104,7 @@ static struct scsi_host_template generic
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24691,9 +24696,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/ata_generic.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_unknown,
  	.set_mode	= generic_set_mode,
-diff -urNp linux-2.6.32.45/drivers/ata/ata_piix.c linux-2.6.32.45/drivers/ata/ata_piix.c
---- linux-2.6.32.45/drivers/ata/ata_piix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/ata_piix.c	2011-04-23 12:56:10.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/ata_piix.c linux-2.6.32.46/drivers/ata/ata_piix.c
+--- linux-2.6.32.46/drivers/ata/ata_piix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/ata_piix.c	2011-04-23 12:56:10.000000000 -0400
 @@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24730,9 +24735,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/ata_piix.c linux-2.6.32.45/drivers/ata/at
  	.inherits		= &piix_sata_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= piix_sidpr_scr_read,
-diff -urNp linux-2.6.32.45/drivers/ata/libata-acpi.c linux-2.6.32.45/drivers/ata/libata-acpi.c
---- linux-2.6.32.45/drivers/ata/libata-acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/libata-acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/libata-acpi.c linux-2.6.32.46/drivers/ata/libata-acpi.c
+--- linux-2.6.32.46/drivers/ata/libata-acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/libata-acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
  	ata_acpi_uevent(dev->link->ap, dev, event);
  }
@@ -24748,9 +24753,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/libata-acpi.c linux-2.6.32.45/drivers/ata
  	.handler = ata_acpi_ap_notify_dock,
  	.uevent = ata_acpi_ap_uevent,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/libata-core.c linux-2.6.32.45/drivers/ata/libata-core.c
---- linux-2.6.32.45/drivers/ata/libata-core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/libata-core.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/libata-core.c linux-2.6.32.46/drivers/ata/libata-core.c
+--- linux-2.6.32.46/drivers/ata/libata-core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/libata-core.c	2011-08-05 20:33:55.000000000 -0400
 @@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
@@ -24815,9 +24820,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/libata-core.c linux-2.6.32.45/drivers/ata
  	.qc_prep		= ata_noop_qc_prep,
  	.qc_issue		= ata_dummy_qc_issue,
  	.error_handler		= ata_dummy_error_handler,
-diff -urNp linux-2.6.32.45/drivers/ata/libata-eh.c linux-2.6.32.45/drivers/ata/libata-eh.c
---- linux-2.6.32.45/drivers/ata/libata-eh.c	2011-08-09 18:35:28.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/libata-eh.c	2011-08-09 18:33:59.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/libata-eh.c linux-2.6.32.46/drivers/ata/libata-eh.c
+--- linux-2.6.32.46/drivers/ata/libata-eh.c	2011-08-09 18:35:28.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/libata-eh.c	2011-08-09 18:33:59.000000000 -0400
 @@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap)
  {
  	struct ata_link *link;
@@ -24836,9 +24841,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/libata-eh.c linux-2.6.32.45/drivers/ata/l
  	ata_reset_fn_t hardreset = ops->hardreset;
  
  	/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.32.45/drivers/ata/libata-pmp.c linux-2.6.32.45/drivers/ata/libata-pmp.c
---- linux-2.6.32.45/drivers/ata/libata-pmp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/libata-pmp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/libata-pmp.c linux-2.6.32.46/drivers/ata/libata-pmp.c
+--- linux-2.6.32.46/drivers/ata/libata-pmp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/libata-pmp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
   */
  static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -24848,9 +24853,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/libata-pmp.c linux-2.6.32.45/drivers/ata/
  	int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
  	struct ata_link *pmp_link = &ap->link;
  	struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.32.45/drivers/ata/pata_acpi.c linux-2.6.32.45/drivers/ata/pata_acpi.c
---- linux-2.6.32.45/drivers/ata/pata_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_acpi.c linux-2.6.32.46/drivers/ata/pata_acpi.c
+--- linux-2.6.32.46/drivers/ata/pata_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24860,9 +24865,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_acpi.c linux-2.6.32.45/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= pacpi_qc_issue,
  	.cable_detect		= pacpi_cable_detect,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_ali.c linux-2.6.32.45/drivers/ata/pata_ali.c
---- linux-2.6.32.45/drivers/ata/pata_ali.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_ali.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_ali.c linux-2.6.32.46/drivers/ata/pata_ali.c
+--- linux-2.6.32.46/drivers/ata/pata_ali.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_ali.c	2011-04-17 15:56:46.000000000 -0400
 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
   *	Port operations for PIO only ALi
   */
@@ -24908,9 +24913,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_ali.c linux-2.6.32.45/drivers/ata/pa
  	.inherits	= &ali_dma_base_ops,
  	.check_atapi_dma = ali_check_atapi_dma,
  	.dev_config	= ali_warn_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_amd.c linux-2.6.32.45/drivers/ata/pata_amd.c
---- linux-2.6.32.45/drivers/ata/pata_amd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_amd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_amd.c linux-2.6.32.46/drivers/ata/pata_amd.c
+--- linux-2.6.32.46/drivers/ata/pata_amd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_amd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -397,28 +397,28 @@ static const struct ata_port_operations 
  	.prereset	= amd_pre_reset,
  };
@@ -24960,9 +24965,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_amd.c linux-2.6.32.45/drivers/ata/pa
  	.inherits	= &nv_base_port_ops,
  	.set_piomode	= nv133_set_piomode,
  	.set_dmamode	= nv133_set_dmamode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_artop.c linux-2.6.32.45/drivers/ata/pata_artop.c
---- linux-2.6.32.45/drivers/ata/pata_artop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_artop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_artop.c linux-2.6.32.46/drivers/ata/pata_artop.c
+--- linux-2.6.32.46/drivers/ata/pata_artop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_artop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -24981,9 +24986,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_artop.c linux-2.6.32.45/drivers/ata/
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= artop6260_cable_detect,
  	.set_piomode		= artop6260_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_at32.c linux-2.6.32.45/drivers/ata/pata_at32.c
---- linux-2.6.32.45/drivers/ata/pata_at32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_at32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_at32.c linux-2.6.32.46/drivers/ata/pata_at32.c
+--- linux-2.6.32.46/drivers/ata/pata_at32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_at32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -24993,9 +24998,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_at32.c linux-2.6.32.45/drivers/ata/p
  	.inherits		= &ata_sff_port_ops,
  	.cable_detect		= ata_cable_40wire,
  	.set_piomode		= pata_at32_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_at91.c linux-2.6.32.45/drivers/ata/pata_at91.c
---- linux-2.6.32.45/drivers/ata/pata_at91.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_at91.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_at91.c linux-2.6.32.46/drivers/ata/pata_at91.c
+--- linux-2.6.32.46/drivers/ata/pata_at91.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_at91.c	2011-04-17 15:56:46.000000000 -0400
 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25005,9 +25010,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_at91.c linux-2.6.32.45/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  
  	.sff_data_xfer	= pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_atiixp.c linux-2.6.32.45/drivers/ata/pata_atiixp.c
---- linux-2.6.32.45/drivers/ata/pata_atiixp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_atiixp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_atiixp.c linux-2.6.32.46/drivers/ata/pata_atiixp.c
+--- linux-2.6.32.46/drivers/ata/pata_atiixp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_atiixp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
@@ -25017,9 +25022,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_atiixp.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.qc_prep 	= ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_atp867x.c linux-2.6.32.45/drivers/ata/pata_atp867x.c
---- linux-2.6.32.45/drivers/ata/pata_atp867x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_atp867x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_atp867x.c linux-2.6.32.46/drivers/ata/pata_atp867x.c
+--- linux-2.6.32.46/drivers/ata/pata_atp867x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_atp867x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25029,9 +25034,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_atp867x.c linux-2.6.32.45/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= atp867x_cable_detect,
  	.set_piomode		= atp867x_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_bf54x.c linux-2.6.32.45/drivers/ata/pata_bf54x.c
---- linux-2.6.32.45/drivers/ata/pata_bf54x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_bf54x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_bf54x.c linux-2.6.32.46/drivers/ata/pata_bf54x.c
+--- linux-2.6.32.46/drivers/ata/pata_bf54x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_bf54x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -25041,9 +25046,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_bf54x.c linux-2.6.32.45/drivers/ata/
  	.inherits		= &ata_sff_port_ops,
  
  	.set_piomode		= bfin_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cmd640.c linux-2.6.32.45/drivers/ata/pata_cmd640.c
---- linux-2.6.32.45/drivers/ata/pata_cmd640.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cmd640.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd640.c linux-2.6.32.46/drivers/ata/pata_cmd640.c
+--- linux-2.6.32.46/drivers/ata/pata_cmd640.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cmd640.c	2011-04-17 15:56:46.000000000 -0400
 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25053,9 +25058,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cmd640.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	/* In theory xfer_noirq is not needed once we kill the prefetcher */
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cmd64x.c linux-2.6.32.45/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.45/drivers/ata/pata_cmd64x.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cmd64x.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cmd64x.c linux-2.6.32.46/drivers/ata/pata_cmd64x.c
+--- linux-2.6.32.46/drivers/ata/pata_cmd64x.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cmd64x.c	2011-06-25 12:56:37.000000000 -0400
 @@ -271,18 +271,18 @@ static const struct ata_port_operations 
  	.set_dmamode	= cmd64x_set_dmamode,
  };
@@ -25078,9 +25083,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cmd64x.c linux-2.6.32.45/drivers/ata
  	.inherits	= &cmd64x_base_ops,
  	.bmdma_stop	= cmd648_bmdma_stop,
  	.cable_detect	= cmd648_cable_detect,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5520.c linux-2.6.32.45/drivers/ata/pata_cs5520.c
---- linux-2.6.32.45/drivers/ata/pata_cs5520.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cs5520.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5520.c linux-2.6.32.46/drivers/ata/pata_cs5520.c
+--- linux-2.6.32.46/drivers/ata/pata_cs5520.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cs5520.c	2011-04-17 15:56:46.000000000 -0400
 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
  	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
  };
@@ -25090,9 +25095,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5520.c linux-2.6.32.45/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_prep		= ata_sff_dumb_qc_prep,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5530.c linux-2.6.32.45/drivers/ata/pata_cs5530.c
---- linux-2.6.32.45/drivers/ata/pata_cs5530.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cs5530.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5530.c linux-2.6.32.46/drivers/ata/pata_cs5530.c
+--- linux-2.6.32.46/drivers/ata/pata_cs5530.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cs5530.c	2011-04-17 15:56:46.000000000 -0400
 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
@@ -25102,9 +25107,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5530.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.qc_prep 	= ata_sff_dumb_qc_prep,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5535.c linux-2.6.32.45/drivers/ata/pata_cs5535.c
---- linux-2.6.32.45/drivers/ata/pata_cs5535.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cs5535.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5535.c linux-2.6.32.46/drivers/ata/pata_cs5535.c
+--- linux-2.6.32.46/drivers/ata/pata_cs5535.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cs5535.c	2011-04-17 15:56:46.000000000 -0400
 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25114,9 +25119,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5535.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= cs5535_cable_detect,
  	.set_piomode	= cs5535_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5536.c linux-2.6.32.45/drivers/ata/pata_cs5536.c
---- linux-2.6.32.45/drivers/ata/pata_cs5536.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cs5536.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cs5536.c linux-2.6.32.46/drivers/ata/pata_cs5536.c
+--- linux-2.6.32.46/drivers/ata/pata_cs5536.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cs5536.c	2011-04-17 15:56:46.000000000 -0400
 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25126,9 +25131,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5536.c linux-2.6.32.45/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= cs5536_cable_detect,
  	.set_piomode		= cs5536_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_cypress.c linux-2.6.32.45/drivers/ata/pata_cypress.c
---- linux-2.6.32.45/drivers/ata/pata_cypress.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_cypress.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_cypress.c linux-2.6.32.46/drivers/ata/pata_cypress.c
+--- linux-2.6.32.46/drivers/ata/pata_cypress.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_cypress.c	2011-04-17 15:56:46.000000000 -0400
 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25138,9 +25143,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_cypress.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= cy82c693_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_efar.c linux-2.6.32.45/drivers/ata/pata_efar.c
---- linux-2.6.32.45/drivers/ata/pata_efar.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_efar.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_efar.c linux-2.6.32.46/drivers/ata/pata_efar.c
+--- linux-2.6.32.46/drivers/ata/pata_efar.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_efar.c	2011-04-17 15:56:46.000000000 -0400
 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25150,9 +25155,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_efar.c linux-2.6.32.45/drivers/ata/p
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= efar_cable_detect,
  	.set_piomode		= efar_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt366.c linux-2.6.32.45/drivers/ata/pata_hpt366.c
---- linux-2.6.32.45/drivers/ata/pata_hpt366.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_hpt366.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt366.c linux-2.6.32.46/drivers/ata/pata_hpt366.c
+--- linux-2.6.32.46/drivers/ata/pata_hpt366.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_hpt366.c	2011-06-25 12:56:37.000000000 -0400
 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
   *	Configuration for HPT366/68
   */
@@ -25162,9 +25167,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt366.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= hpt36x_cable_detect,
  	.mode_filter	= hpt366_filter,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt37x.c linux-2.6.32.45/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.45/drivers/ata/pata_hpt37x.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_hpt37x.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt37x.c linux-2.6.32.46/drivers/ata/pata_hpt37x.c
+--- linux-2.6.32.46/drivers/ata/pata_hpt37x.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_hpt37x.c	2011-06-25 12:56:37.000000000 -0400
 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
   *	Configuration for HPT370
   */
@@ -25201,9 +25206,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt37x.c linux-2.6.32.45/drivers/ata
  	.inherits	= &hpt372_port_ops,
  	.prereset	= hpt374_fn1_pre_reset,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_hpt3x2n.c	2011-06-25 12:56:37.000000000 -0400
 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
   *	Configuration for HPT3x2n.
   */
@@ -25213,9 +25218,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  
  	.bmdma_stop	= hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt3x3.c linux-2.6.32.45/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.45/drivers/ata/pata_hpt3x3.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_hpt3x3.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_hpt3x3.c linux-2.6.32.46/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.32.46/drivers/ata/pata_hpt3x3.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_hpt3x3.c	2011-04-17 15:56:46.000000000 -0400
 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25225,9 +25230,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt3x3.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= hpt3x3_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_icside.c linux-2.6.32.45/drivers/ata/pata_icside.c
---- linux-2.6.32.45/drivers/ata/pata_icside.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_icside.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_icside.c linux-2.6.32.46/drivers/ata/pata_icside.c
+--- linux-2.6.32.46/drivers/ata/pata_icside.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_icside.c	2011-04-17 15:56:46.000000000 -0400
 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
  	}
  }
@@ -25237,9 +25242,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_icside.c linux-2.6.32.45/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	/* no need to build any PRD tables for DMA */
  	.qc_prep		= ata_noop_qc_prep,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_isapnp.c linux-2.6.32.45/drivers/ata/pata_isapnp.c
---- linux-2.6.32.45/drivers/ata/pata_isapnp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_isapnp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_isapnp.c linux-2.6.32.46/drivers/ata/pata_isapnp.c
+--- linux-2.6.32.46/drivers/ata/pata_isapnp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_isapnp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25255,9 +25260,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_isapnp.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.32.45/drivers/ata/pata_it8213.c linux-2.6.32.45/drivers/ata/pata_it8213.c
---- linux-2.6.32.45/drivers/ata/pata_it8213.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_it8213.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_it8213.c linux-2.6.32.46/drivers/ata/pata_it8213.c
+--- linux-2.6.32.46/drivers/ata/pata_it8213.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_it8213.c	2011-04-17 15:56:46.000000000 -0400
 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
  };
  
@@ -25267,9 +25272,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_it8213.c linux-2.6.32.45/drivers/ata
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= it8213_cable_detect,
  	.set_piomode		= it8213_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_it821x.c linux-2.6.32.45/drivers/ata/pata_it821x.c
---- linux-2.6.32.45/drivers/ata/pata_it821x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_it821x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_it821x.c linux-2.6.32.46/drivers/ata/pata_it821x.c
+--- linux-2.6.32.46/drivers/ata/pata_it821x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_it821x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25297,9 +25302,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_it821x.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  
  	.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_ixp4xx_cf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25309,9 +25314,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.45/drivers/
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ixp4xx_mmio_data_xfer,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_jmicron.c linux-2.6.32.45/drivers/ata/pata_jmicron.c
---- linux-2.6.32.45/drivers/ata/pata_jmicron.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_jmicron.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_jmicron.c linux-2.6.32.46/drivers/ata/pata_jmicron.c
+--- linux-2.6.32.46/drivers/ata/pata_jmicron.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_jmicron.c	2011-04-17 15:56:46.000000000 -0400
 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25321,9 +25326,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_jmicron.c linux-2.6.32.45/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= jmicron_pre_reset,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/pata_legacy.c linux-2.6.32.45/drivers/ata/pata_legacy.c
---- linux-2.6.32.45/drivers/ata/pata_legacy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_legacy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_legacy.c linux-2.6.32.46/drivers/ata/pata_legacy.c
+--- linux-2.6.32.46/drivers/ata/pata_legacy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_legacy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -106,7 +106,7 @@ struct legacy_probe {
  
  struct legacy_controller {
@@ -25435,9 +25440,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_legacy.c linux-2.6.32.45/drivers/ata
  	struct legacy_data *ld = &legacy_data[probe->slot];
  	struct ata_host *host = NULL;
  	struct ata_port *ap;
-diff -urNp linux-2.6.32.45/drivers/ata/pata_marvell.c linux-2.6.32.45/drivers/ata/pata_marvell.c
---- linux-2.6.32.45/drivers/ata/pata_marvell.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_marvell.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_marvell.c linux-2.6.32.46/drivers/ata/pata_marvell.c
+--- linux-2.6.32.46/drivers/ata/pata_marvell.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_marvell.c	2011-04-17 15:56:46.000000000 -0400
 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25447,9 +25452,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_marvell.c linux-2.6.32.45/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= marvell_cable_detect,
  	.prereset		= marvell_pre_reset,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_mpc52xx.c linux-2.6.32.45/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.45/drivers/ata/pata_mpc52xx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_mpc52xx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_mpc52xx.c linux-2.6.32.46/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.32.46/drivers/ata/pata_mpc52xx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_mpc52xx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25459,9 +25464,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_mpc52xx.c linux-2.6.32.45/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_dev_select		= mpc52xx_ata_dev_select,
  	.set_piomode		= mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_mpiix.c linux-2.6.32.45/drivers/ata/pata_mpiix.c
---- linux-2.6.32.45/drivers/ata/pata_mpiix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_mpiix.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_mpiix.c linux-2.6.32.46/drivers/ata/pata_mpiix.c
+--- linux-2.6.32.46/drivers/ata/pata_mpiix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_mpiix.c	2011-04-17 15:56:46.000000000 -0400
 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25471,9 +25476,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_mpiix.c linux-2.6.32.45/drivers/ata/
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= mpiix_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_netcell.c linux-2.6.32.45/drivers/ata/pata_netcell.c
---- linux-2.6.32.45/drivers/ata/pata_netcell.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_netcell.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_netcell.c linux-2.6.32.46/drivers/ata/pata_netcell.c
+--- linux-2.6.32.46/drivers/ata/pata_netcell.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_netcell.c	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25483,9 +25488,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_netcell.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.cable_detect	= ata_cable_80wire,
  	.read_id	= netcell_read_id,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_ninja32.c linux-2.6.32.45/drivers/ata/pata_ninja32.c
---- linux-2.6.32.45/drivers/ata/pata_ninja32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_ninja32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_ninja32.c linux-2.6.32.46/drivers/ata/pata_ninja32.c
+--- linux-2.6.32.46/drivers/ata/pata_ninja32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_ninja32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25495,9 +25500,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_ninja32.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.sff_dev_select = ninja32_dev_select,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_ns87410.c linux-2.6.32.45/drivers/ata/pata_ns87410.c
---- linux-2.6.32.45/drivers/ata/pata_ns87410.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_ns87410.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87410.c linux-2.6.32.46/drivers/ata/pata_ns87410.c
+--- linux-2.6.32.46/drivers/ata/pata_ns87410.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_ns87410.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25507,9 +25512,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_ns87410.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_sff_port_ops,
  	.qc_issue	= ns87410_qc_issue,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_ns87415.c linux-2.6.32.45/drivers/ata/pata_ns87415.c
---- linux-2.6.32.45/drivers/ata/pata_ns87415.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_ns87415.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_ns87415.c linux-2.6.32.46/drivers/ata/pata_ns87415.c
+--- linux-2.6.32.46/drivers/ata/pata_ns87415.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_ns87415.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
  }
  #endif		/* 87560 SuperIO Support */
@@ -25528,9 +25533,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_ns87415.c linux-2.6.32.45/drivers/at
  	.inherits		= &ns87415_pata_ops,
  	.sff_tf_read		= ns87560_tf_read,
  	.sff_check_status	= ns87560_check_status,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_octeon_cf.c linux-2.6.32.45/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.45/drivers/ata/pata_octeon_cf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_octeon_cf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_octeon_cf.c linux-2.6.32.46/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.32.46/drivers/ata/pata_octeon_cf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_octeon_cf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
  	return 0;
  }
@@ -25539,9 +25544,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_octeon_cf.c linux-2.6.32.45/drivers/
  static struct ata_port_operations octeon_cf_ops = {
  	.inherits		= &ata_sff_port_ops,
  	.check_atapi_dma	= octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_oldpiix.c linux-2.6.32.45/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.45/drivers/ata/pata_oldpiix.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_oldpiix.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_oldpiix.c linux-2.6.32.46/drivers/ata/pata_oldpiix.c
+--- linux-2.6.32.46/drivers/ata/pata_oldpiix.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_oldpiix.c	2011-04-17 15:56:46.000000000 -0400
 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25551,9 +25556,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_oldpiix.c linux-2.6.32.45/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= oldpiix_qc_issue,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_opti.c linux-2.6.32.45/drivers/ata/pata_opti.c
---- linux-2.6.32.45/drivers/ata/pata_opti.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_opti.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_opti.c linux-2.6.32.46/drivers/ata/pata_opti.c
+--- linux-2.6.32.46/drivers/ata/pata_opti.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_opti.c	2011-04-17 15:56:46.000000000 -0400
 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25563,9 +25568,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_opti.c linux-2.6.32.45/drivers/ata/p
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_piomode	= opti_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_optidma.c linux-2.6.32.45/drivers/ata/pata_optidma.c
---- linux-2.6.32.45/drivers/ata/pata_optidma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_optidma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_optidma.c linux-2.6.32.46/drivers/ata/pata_optidma.c
+--- linux-2.6.32.46/drivers/ata/pata_optidma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_optidma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25584,9 +25589,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_optidma.c linux-2.6.32.45/drivers/at
  	.inherits	= &optidma_port_ops,
  	.set_piomode	= optiplus_set_pio_mode,
  	.set_dmamode	= optiplus_set_dma_mode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_palmld.c linux-2.6.32.45/drivers/ata/pata_palmld.c
---- linux-2.6.32.45/drivers/ata/pata_palmld.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_palmld.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_palmld.c linux-2.6.32.46/drivers/ata/pata_palmld.c
+--- linux-2.6.32.46/drivers/ata/pata_palmld.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_palmld.c	2011-04-17 15:56:46.000000000 -0400
 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25596,9 +25601,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_palmld.c linux-2.6.32.45/drivers/ata
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_pcmcia.c linux-2.6.32.45/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.45/drivers/ata/pata_pcmcia.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_pcmcia.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_pcmcia.c linux-2.6.32.46/drivers/ata/pata_pcmcia.c
+--- linux-2.6.32.46/drivers/ata/pata_pcmcia.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_pcmcia.c	2011-04-17 15:56:46.000000000 -0400
 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25625,9 +25630,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_pcmcia.c linux-2.6.32.45/drivers/ata
  
  	info = kzalloc(sizeof(*info), GFP_KERNEL);
  	if (info == NULL)
-diff -urNp linux-2.6.32.45/drivers/ata/pata_pdc2027x.c linux-2.6.32.45/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.45/drivers/ata/pata_pdc2027x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_pdc2027x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc2027x.c linux-2.6.32.46/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.32.46/drivers/ata/pata_pdc2027x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_pdc2027x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25645,9 +25650,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_pdc2027x.c linux-2.6.32.45/drivers/a
  	.inherits		= &pdc2027x_pata100_ops,
  	.mode_filter		= pdc2027x_mode_filter,
  	.set_piomode		= pdc2027x_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_pdc202xx_old.c	2011-04-17 15:56:46.000000000 -0400
 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25666,9 +25671,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.45/drive
  	.inherits		= &pdc2024x_port_ops,
  
  	.check_atapi_dma	= pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_platform.c linux-2.6.32.45/drivers/ata/pata_platform.c
---- linux-2.6.32.45/drivers/ata/pata_platform.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_platform.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_platform.c linux-2.6.32.46/drivers/ata/pata_platform.c
+--- linux-2.6.32.46/drivers/ata/pata_platform.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_platform.c	2011-04-17 15:56:46.000000000 -0400
 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25678,9 +25683,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_platform.c linux-2.6.32.45/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer_noirq,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_qdi.c linux-2.6.32.45/drivers/ata/pata_qdi.c
---- linux-2.6.32.45/drivers/ata/pata_qdi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_qdi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_qdi.c linux-2.6.32.46/drivers/ata/pata_qdi.c
+--- linux-2.6.32.46/drivers/ata/pata_qdi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_qdi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25699,9 +25704,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_qdi.c linux-2.6.32.45/drivers/ata/pa
  	.inherits	= &qdi6500_port_ops,
  	.set_piomode	= qdi6580_set_piomode,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/pata_radisys.c linux-2.6.32.45/drivers/ata/pata_radisys.c
---- linux-2.6.32.45/drivers/ata/pata_radisys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_radisys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_radisys.c linux-2.6.32.46/drivers/ata/pata_radisys.c
+--- linux-2.6.32.46/drivers/ata/pata_radisys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_radisys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25711,9 +25716,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_radisys.c linux-2.6.32.45/drivers/at
  	.inherits		= &ata_bmdma_port_ops,
  	.qc_issue		= radisys_qc_issue,
  	.cable_detect		= ata_cable_unknown,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_rb532_cf.c linux-2.6.32.45/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.45/drivers/ata/pata_rb532_cf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_rb532_cf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_rb532_cf.c linux-2.6.32.46/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.32.46/drivers/ata/pata_rb532_cf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_rb532_cf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
  	return IRQ_HANDLED;
  }
@@ -25723,9 +25728,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_rb532_cf.c linux-2.6.32.45/drivers/a
  	.inherits		= &ata_sff_port_ops,
  	.sff_data_xfer		= ata_sff_data_xfer32,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/pata_rdc.c linux-2.6.32.45/drivers/ata/pata_rdc.c
---- linux-2.6.32.45/drivers/ata/pata_rdc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_rdc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_rdc.c linux-2.6.32.46/drivers/ata/pata_rdc.c
+--- linux-2.6.32.46/drivers/ata/pata_rdc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_rdc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
  	pci_write_config_byte(dev, 0x48, udma_enable);
  }
@@ -25735,9 +25740,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_rdc.c linux-2.6.32.45/drivers/ata/pa
  	.inherits		= &ata_bmdma32_port_ops,
  	.cable_detect		= rdc_pata_cable_detect,
  	.set_piomode		= rdc_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_rz1000.c linux-2.6.32.45/drivers/ata/pata_rz1000.c
---- linux-2.6.32.45/drivers/ata/pata_rz1000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_rz1000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_rz1000.c linux-2.6.32.46/drivers/ata/pata_rz1000.c
+--- linux-2.6.32.46/drivers/ata/pata_rz1000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_rz1000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25747,9 +25752,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_rz1000.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_sff_port_ops,
  	.cable_detect	= ata_cable_40wire,
  	.set_mode	= rz1000_set_mode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_sc1200.c linux-2.6.32.45/drivers/ata/pata_sc1200.c
---- linux-2.6.32.45/drivers/ata/pata_sc1200.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_sc1200.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_sc1200.c linux-2.6.32.46/drivers/ata/pata_sc1200.c
+--- linux-2.6.32.46/drivers/ata/pata_sc1200.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_sc1200.c	2011-04-17 15:56:46.000000000 -0400
 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
  	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
  };
@@ -25759,9 +25764,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_sc1200.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_prep 	= ata_sff_dumb_qc_prep,
  	.qc_issue	= sc1200_qc_issue,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_scc.c linux-2.6.32.45/drivers/ata/pata_scc.c
---- linux-2.6.32.45/drivers/ata/pata_scc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_scc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_scc.c linux-2.6.32.46/drivers/ata/pata_scc.c
+--- linux-2.6.32.46/drivers/ata/pata_scc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_scc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25771,9 +25776,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_scc.c linux-2.6.32.45/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  
  	.set_piomode		= scc_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_sch.c linux-2.6.32.45/drivers/ata/pata_sch.c
---- linux-2.6.32.45/drivers/ata/pata_sch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_sch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_sch.c linux-2.6.32.46/drivers/ata/pata_sch.c
+--- linux-2.6.32.46/drivers/ata/pata_sch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_sch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25783,9 +25788,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_sch.c linux-2.6.32.45/drivers/ata/pa
  	.inherits		= &ata_bmdma_port_ops,
  	.cable_detect		= ata_cable_unknown,
  	.set_piomode		= sch_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_serverworks.c linux-2.6.32.45/drivers/ata/pata_serverworks.c
---- linux-2.6.32.45/drivers/ata/pata_serverworks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_serverworks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_serverworks.c linux-2.6.32.46/drivers/ata/pata_serverworks.c
+--- linux-2.6.32.46/drivers/ata/pata_serverworks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_serverworks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25804,9 +25809,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_serverworks.c linux-2.6.32.45/driver
  	.inherits	= &serverworks_osb4_port_ops,
  	.mode_filter	= serverworks_csb_filter,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/pata_sil680.c linux-2.6.32.45/drivers/ata/pata_sil680.c
---- linux-2.6.32.45/drivers/ata/pata_sil680.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_sil680.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_sil680.c linux-2.6.32.46/drivers/ata/pata_sil680.c
+--- linux-2.6.32.46/drivers/ata/pata_sil680.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_sil680.c	2011-06-25 12:56:37.000000000 -0400
 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25816,9 +25821,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_sil680.c linux-2.6.32.45/drivers/ata
  	.inherits	= &ata_bmdma32_port_ops,
  	.cable_detect	= sil680_cable_detect,
  	.set_piomode	= sil680_set_piomode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_sis.c linux-2.6.32.45/drivers/ata/pata_sis.c
---- linux-2.6.32.45/drivers/ata/pata_sis.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_sis.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_sis.c linux-2.6.32.46/drivers/ata/pata_sis.c
+--- linux-2.6.32.46/drivers/ata/pata_sis.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_sis.c	2011-04-17 15:56:46.000000000 -0400
 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25874,9 +25879,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_sis.c linux-2.6.32.45/drivers/ata/pa
  	.inherits		= &sis_base_ops,
  	.set_piomode		= sis_old_set_piomode,
  	.set_dmamode		= sis_old_set_dmamode,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_sl82c105.c linux-2.6.32.45/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.45/drivers/ata/pata_sl82c105.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_sl82c105.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_sl82c105.c linux-2.6.32.46/drivers/ata/pata_sl82c105.c
+--- linux-2.6.32.46/drivers/ata/pata_sl82c105.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_sl82c105.c	2011-04-17 15:56:46.000000000 -0400
 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25886,9 +25891,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_sl82c105.c linux-2.6.32.45/drivers/a
  	.inherits	= &ata_bmdma_port_ops,
  	.qc_defer	= sl82c105_qc_defer,
  	.bmdma_start 	= sl82c105_bmdma_start,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_triflex.c linux-2.6.32.45/drivers/ata/pata_triflex.c
---- linux-2.6.32.45/drivers/ata/pata_triflex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_triflex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_triflex.c linux-2.6.32.46/drivers/ata/pata_triflex.c
+--- linux-2.6.32.46/drivers/ata/pata_triflex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_triflex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25898,9 +25903,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_triflex.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_bmdma_port_ops,
  	.bmdma_start 	= triflex_bmdma_start,
  	.bmdma_stop	= triflex_bmdma_stop,
-diff -urNp linux-2.6.32.45/drivers/ata/pata_via.c linux-2.6.32.45/drivers/ata/pata_via.c
---- linux-2.6.32.45/drivers/ata/pata_via.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_via.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_via.c linux-2.6.32.46/drivers/ata/pata_via.c
+--- linux-2.6.32.46/drivers/ata/pata_via.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_via.c	2011-04-17 15:56:46.000000000 -0400
 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -25919,9 +25924,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_via.c linux-2.6.32.45/drivers/ata/pa
  	.inherits	= &via_port_ops,
  	.sff_data_xfer	= ata_sff_data_xfer_noirq,
  };
-diff -urNp linux-2.6.32.45/drivers/ata/pata_winbond.c linux-2.6.32.45/drivers/ata/pata_winbond.c
---- linux-2.6.32.45/drivers/ata/pata_winbond.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pata_winbond.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pata_winbond.c linux-2.6.32.46/drivers/ata/pata_winbond.c
+--- linux-2.6.32.46/drivers/ata/pata_winbond.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pata_winbond.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond
  	ATA_PIO_SHT(DRV_NAME),
  };
@@ -25931,9 +25936,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pata_winbond.c linux-2.6.32.45/drivers/at
  	.inherits	= &ata_sff_port_ops,
  	.sff_data_xfer	= winbond_data_xfer,
  	.cable_detect	= ata_cable_40wire,
-diff -urNp linux-2.6.32.45/drivers/ata/pdc_adma.c linux-2.6.32.45/drivers/ata/pdc_adma.c
---- linux-2.6.32.45/drivers/ata/pdc_adma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/pdc_adma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/pdc_adma.c linux-2.6.32.46/drivers/ata/pdc_adma.c
+--- linux-2.6.32.46/drivers/ata/pdc_adma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/pdc_adma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
  	.dma_boundary		= ADMA_DMA_BOUNDARY,
  };
@@ -25943,9 +25948,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/pdc_adma.c linux-2.6.32.45/drivers/ata/pd
  	.inherits		= &ata_sff_port_ops,
  
  	.lost_interrupt		= ATA_OP_NULL,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_fsl.c linux-2.6.32.45/drivers/ata/sata_fsl.c
---- linux-2.6.32.45/drivers/ata/sata_fsl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_fsl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_fsl.c linux-2.6.32.46/drivers/ata/sata_fsl.c
+--- linux-2.6.32.46/drivers/ata/sata_fsl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_fsl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
  	.dma_boundary = ATA_DMA_BOUNDARY,
  };
@@ -25955,9 +25960,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_fsl.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_inic162x.c linux-2.6.32.45/drivers/ata/sata_inic162x.c
---- linux-2.6.32.45/drivers/ata/sata_inic162x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_inic162x.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_inic162x.c linux-2.6.32.46/drivers/ata/sata_inic162x.c
+--- linux-2.6.32.46/drivers/ata/sata_inic162x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_inic162x.c	2011-04-17 15:56:46.000000000 -0400
 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
  	return 0;
  }
@@ -25967,9 +25972,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_inic162x.c linux-2.6.32.45/drivers/a
  	.inherits		= &sata_port_ops,
  
  	.check_atapi_dma	= inic_check_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_mv.c linux-2.6.32.45/drivers/ata/sata_mv.c
---- linux-2.6.32.45/drivers/ata/sata_mv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_mv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_mv.c linux-2.6.32.46/drivers/ata/sata_mv.c
+--- linux-2.6.32.46/drivers/ata/sata_mv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_mv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
  	.dma_boundary		= MV_DMA_BOUNDARY,
  };
@@ -25997,9 +26002,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_mv.c linux-2.6.32.45/drivers/ata/sat
  	.inherits		= &mv6_ops,
  	.dev_config		= ATA_OP_NULL,
  	.qc_prep		= mv_qc_prep_iie,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_nv.c linux-2.6.32.45/drivers/ata/sata_nv.c
---- linux-2.6.32.45/drivers/ata/sata_nv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_nv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_nv.c linux-2.6.32.46/drivers/ata/sata_nv.c
+--- linux-2.6.32.46/drivers/ata/sata_nv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_nv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
   * cases.  Define nv_hardreset() which only kicks in for post-boot
   * probing and use it for all variants.
@@ -26042,9 +26047,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_nv.c linux-2.6.32.45/drivers/ata/sat
  	.inherits		= &nv_generic_ops,
  
  	.qc_defer		= ata_std_qc_defer,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_promise.c linux-2.6.32.45/drivers/ata/sata_promise.c
---- linux-2.6.32.45/drivers/ata/sata_promise.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_promise.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_promise.c linux-2.6.32.46/drivers/ata/sata_promise.c
+--- linux-2.6.32.46/drivers/ata/sata_promise.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_promise.c	2011-04-17 15:56:46.000000000 -0400
 @@ -195,7 +195,7 @@ static const struct ata_port_operations 
  	.error_handler		= pdc_error_handler,
  };
@@ -26071,9 +26076,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_promise.c linux-2.6.32.45/drivers/at
  	.inherits		= &pdc_common_ops,
  	.cable_detect		= pdc_pata_cable_detect,
  	.freeze			= pdc_freeze,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_qstor.c linux-2.6.32.45/drivers/ata/sata_qstor.c
---- linux-2.6.32.45/drivers/ata/sata_qstor.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_qstor.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_qstor.c linux-2.6.32.46/drivers/ata/sata_qstor.c
+--- linux-2.6.32.46/drivers/ata/sata_qstor.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_qstor.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
  	.dma_boundary		= QS_DMA_BOUNDARY,
  };
@@ -26083,9 +26088,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_qstor.c linux-2.6.32.45/drivers/ata/
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= qs_check_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_sil24.c linux-2.6.32.45/drivers/ata/sata_sil24.c
---- linux-2.6.32.45/drivers/ata/sata_sil24.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_sil24.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_sil24.c linux-2.6.32.46/drivers/ata/sata_sil24.c
+--- linux-2.6.32.46/drivers/ata/sata_sil24.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_sil24.c	2011-04-17 15:56:46.000000000 -0400
 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
  	.dma_boundary		= ATA_DMA_BOUNDARY,
  };
@@ -26095,9 +26100,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_sil24.c linux-2.6.32.45/drivers/ata/
  	.inherits		= &sata_pmp_port_ops,
  
  	.qc_defer		= sil24_qc_defer,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_sil.c linux-2.6.32.45/drivers/ata/sata_sil.c
---- linux-2.6.32.45/drivers/ata/sata_sil.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_sil.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_sil.c linux-2.6.32.46/drivers/ata/sata_sil.c
+--- linux-2.6.32.46/drivers/ata/sata_sil.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_sil.c	2011-04-17 15:56:46.000000000 -0400
 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
  	.sg_tablesize		= ATA_MAX_PRD
  };
@@ -26107,9 +26112,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_sil.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &ata_bmdma32_port_ops,
  	.dev_config		= sil_dev_config,
  	.set_mode		= sil_set_mode,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_sis.c linux-2.6.32.45/drivers/ata/sata_sis.c
---- linux-2.6.32.45/drivers/ata/sata_sis.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_sis.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_sis.c linux-2.6.32.46/drivers/ata/sata_sis.c
+--- linux-2.6.32.46/drivers/ata/sata_sis.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_sis.c	2011-04-17 15:56:46.000000000 -0400
 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -26119,9 +26124,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_sis.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= sis_scr_read,
  	.scr_write		= sis_scr_write,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_svw.c linux-2.6.32.45/drivers/ata/sata_svw.c
---- linux-2.6.32.45/drivers/ata/sata_svw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_svw.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_svw.c linux-2.6.32.46/drivers/ata/sata_svw.c
+--- linux-2.6.32.46/drivers/ata/sata_svw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_svw.c	2011-04-17 15:56:46.000000000 -0400
 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
  };
  
@@ -26131,9 +26136,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_svw.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.sff_tf_load		= k2_sata_tf_load,
  	.sff_tf_read		= k2_sata_tf_read,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_sx4.c linux-2.6.32.45/drivers/ata/sata_sx4.c
---- linux-2.6.32.45/drivers/ata/sata_sx4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_sx4.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_sx4.c linux-2.6.32.46/drivers/ata/sata_sx4.c
+--- linux-2.6.32.46/drivers/ata/sata_sx4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_sx4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
  };
  
@@ -26143,9 +26148,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_sx4.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= pdc_check_atapi_dma,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_uli.c linux-2.6.32.45/drivers/ata/sata_uli.c
---- linux-2.6.32.45/drivers/ata/sata_uli.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_uli.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_uli.c linux-2.6.32.46/drivers/ata/sata_uli.c
+--- linux-2.6.32.46/drivers/ata/sata_uli.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_uli.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -26155,9 +26160,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_uli.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	.scr_read		= uli_scr_read,
  	.scr_write		= uli_scr_write,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_via.c linux-2.6.32.45/drivers/ata/sata_via.c
---- linux-2.6.32.45/drivers/ata/sata_via.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_via.c	2011-05-10 22:15:08.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_via.c linux-2.6.32.46/drivers/ata/sata_via.c
+--- linux-2.6.32.46/drivers/ata/sata_via.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_via.c	2011-05-10 22:15:08.000000000 -0400
 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -26196,9 +26201,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_via.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &svia_base_ops,
  	.hardreset		= sata_std_hardreset,
  	.scr_read		= vt8251_scr_read,
-diff -urNp linux-2.6.32.45/drivers/ata/sata_vsc.c linux-2.6.32.45/drivers/ata/sata_vsc.c
---- linux-2.6.32.45/drivers/ata/sata_vsc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ata/sata_vsc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ata/sata_vsc.c linux-2.6.32.46/drivers/ata/sata_vsc.c
+--- linux-2.6.32.46/drivers/ata/sata_vsc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_vsc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
  };
  
@@ -26208,9 +26213,9 @@ diff -urNp linux-2.6.32.45/drivers/ata/sata_vsc.c linux-2.6.32.45/drivers/ata/sa
  	.inherits		= &ata_bmdma_port_ops,
  	/* The IRQ handling is not quite standard SFF behaviour so we
  	   cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.32.45/drivers/atm/adummy.c linux-2.6.32.45/drivers/atm/adummy.c
---- linux-2.6.32.45/drivers/atm/adummy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/adummy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/adummy.c linux-2.6.32.46/drivers/atm/adummy.c
+--- linux-2.6.32.46/drivers/atm/adummy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/adummy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
@@ -26220,9 +26225,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/adummy.c linux-2.6.32.45/drivers/atm/adum
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/drivers/atm/ambassador.c linux-2.6.32.45/drivers/atm/ambassador.c
---- linux-2.6.32.45/drivers/atm/ambassador.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/ambassador.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/ambassador.c linux-2.6.32.46/drivers/atm/ambassador.c
+--- linux-2.6.32.46/drivers/atm/ambassador.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/ambassador.c	2011-04-17 15:56:46.000000000 -0400
 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -26259,9 +26264,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/ambassador.c linux-2.6.32.45/drivers/atm/
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-2.6.32.45/drivers/atm/atmtcp.c linux-2.6.32.45/drivers/atm/atmtcp.c
---- linux-2.6.32.45/drivers/atm/atmtcp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/atmtcp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/atmtcp.c linux-2.6.32.46/drivers/atm/atmtcp.c
+--- linux-2.6.32.46/drivers/atm/atmtcp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/atmtcp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -26311,9 +26316,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/atmtcp.c linux-2.6.32.45/drivers/atm/atmt
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-2.6.32.45/drivers/atm/eni.c linux-2.6.32.45/drivers/atm/eni.c
---- linux-2.6.32.45/drivers/atm/eni.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/eni.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/eni.c linux-2.6.32.46/drivers/atm/eni.c
+--- linux-2.6.32.46/drivers/atm/eni.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/eni.c	2011-04-17 15:56:46.000000000 -0400
 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
@@ -26359,9 +26364,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/eni.c linux-2.6.32.45/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-2.6.32.45/drivers/atm/firestream.c linux-2.6.32.45/drivers/atm/firestream.c
---- linux-2.6.32.45/drivers/atm/firestream.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/firestream.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/firestream.c linux-2.6.32.46/drivers/atm/firestream.c
+--- linux-2.6.32.46/drivers/atm/firestream.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/firestream.c	2011-04-17 15:56:46.000000000 -0400
 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct
  				}
  			}
@@ -26395,9 +26400,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/firestream.c linux-2.6.32.45/drivers/atm/
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-2.6.32.45/drivers/atm/fore200e.c linux-2.6.32.45/drivers/atm/fore200e.c
---- linux-2.6.32.45/drivers/atm/fore200e.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/fore200e.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/fore200e.c linux-2.6.32.46/drivers/atm/fore200e.c
+--- linux-2.6.32.46/drivers/atm/fore200e.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/fore200e.c	2011-04-17 15:56:46.000000000 -0400
 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
@@ -26454,9 +26459,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/fore200e.c linux-2.6.32.45/drivers/atm/fo
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.32.45/drivers/atm/he.c linux-2.6.32.45/drivers/atm/he.c
---- linux-2.6.32.45/drivers/atm/he.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/he.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/he.c linux-2.6.32.46/drivers/atm/he.c
+--- linux-2.6.32.46/drivers/atm/he.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/he.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -26538,9 +26543,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/he.c linux-2.6.32.45/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/drivers/atm/horizon.c linux-2.6.32.45/drivers/atm/horizon.c
---- linux-2.6.32.45/drivers/atm/horizon.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/horizon.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/horizon.c linux-2.6.32.46/drivers/atm/horizon.c
+--- linux-2.6.32.46/drivers/atm/horizon.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/horizon.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -26559,9 +26564,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/horizon.c linux-2.6.32.45/drivers/atm/hor
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-2.6.32.45/drivers/atm/idt77252.c linux-2.6.32.45/drivers/atm/idt77252.c
---- linux-2.6.32.45/drivers/atm/idt77252.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/idt77252.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/idt77252.c linux-2.6.32.46/drivers/atm/idt77252.c
+--- linux-2.6.32.46/drivers/atm/idt77252.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/idt77252.c	2011-04-17 15:56:46.000000000 -0400
 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
@@ -26716,9 +26721,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/idt77252.c linux-2.6.32.45/drivers/atm/id
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.32.45/drivers/atm/iphase.c linux-2.6.32.45/drivers/atm/iphase.c
---- linux-2.6.32.45/drivers/atm/iphase.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/iphase.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/iphase.c linux-2.6.32.46/drivers/atm/iphase.c
+--- linux-2.6.32.46/drivers/atm/iphase.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/iphase.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	status = (u_short) (buf_desc_ptr->desc_mode);  
  	if (status & (RX_CER | RX_PTE | RX_OFL))  
@@ -26815,9 +26820,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/iphase.c linux-2.6.32.45/drivers/atm/ipha
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.32.45/drivers/atm/lanai.c linux-2.6.32.45/drivers/atm/lanai.c
---- linux-2.6.32.45/drivers/atm/lanai.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/lanai.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/lanai.c linux-2.6.32.46/drivers/atm/lanai.c
+--- linux-2.6.32.46/drivers/atm/lanai.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/lanai.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
  	vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
  	lanai_endtx(lanai, lvcc);
@@ -26872,9 +26877,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/lanai.c linux-2.6.32.45/drivers/atm/lanai
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.32.45/drivers/atm/nicstar.c linux-2.6.32.45/drivers/atm/nicstar.c
---- linux-2.6.32.45/drivers/atm/nicstar.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/nicstar.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/nicstar.c linux-2.6.32.46/drivers/atm/nicstar.c
+--- linux-2.6.32.46/drivers/atm/nicstar.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/nicstar.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 
     if ((vc = (vc_map *) vcc->dev_data) == NULL)
     {
@@ -27077,9 +27082,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/nicstar.c linux-2.6.32.45/drivers/atm/nic
           }
        }
  
-diff -urNp linux-2.6.32.45/drivers/atm/solos-pci.c linux-2.6.32.45/drivers/atm/solos-pci.c
---- linux-2.6.32.45/drivers/atm/solos-pci.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/solos-pci.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/solos-pci.c linux-2.6.32.46/drivers/atm/solos-pci.c
+--- linux-2.6.32.46/drivers/atm/solos-pci.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/solos-pci.c	2011-05-16 21:46:57.000000000 -0400
 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
@@ -27107,9 +27112,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/solos-pci.c linux-2.6.32.45/drivers/atm/s
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.32.45/drivers/atm/suni.c linux-2.6.32.45/drivers/atm/suni.c
---- linux-2.6.32.45/drivers/atm/suni.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/suni.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/suni.c linux-2.6.32.46/drivers/atm/suni.c
+--- linux-2.6.32.46/drivers/atm/suni.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/suni.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -27121,9 +27126,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/suni.c linux-2.6.32.45/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.32.45/drivers/atm/uPD98402.c linux-2.6.32.45/drivers/atm/uPD98402.c
---- linux-2.6.32.45/drivers/atm/uPD98402.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/uPD98402.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/uPD98402.c linux-2.6.32.46/drivers/atm/uPD98402.c
+--- linux-2.6.32.46/drivers/atm/uPD98402.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/uPD98402.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
@@ -27168,9 +27173,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/uPD98402.c linux-2.6.32.45/drivers/atm/uP
  	return 0;
  }
  
-diff -urNp linux-2.6.32.45/drivers/atm/zatm.c linux-2.6.32.45/drivers/atm/zatm.c
---- linux-2.6.32.45/drivers/atm/zatm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/atm/zatm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/atm/zatm.c linux-2.6.32.46/drivers/atm/zatm.c
+--- linux-2.6.32.46/drivers/atm/zatm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/atm/zatm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
@@ -27198,9 +27203,9 @@ diff -urNp linux-2.6.32.45/drivers/atm/zatm.c linux-2.6.32.45/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-2.6.32.45/drivers/base/bus.c linux-2.6.32.45/drivers/base/bus.c
---- linux-2.6.32.45/drivers/base/bus.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/base/bus.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/base/bus.c linux-2.6.32.46/drivers/base/bus.c
+--- linux-2.6.32.46/drivers/base/bus.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/base/bus.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
  	return ret;
  }
@@ -27228,9 +27233,9 @@ diff -urNp linux-2.6.32.45/drivers/base/bus.c linux-2.6.32.45/drivers/base/bus.c
  	.filter = bus_uevent_filter,
  };
  
-diff -urNp linux-2.6.32.45/drivers/base/class.c linux-2.6.32.45/drivers/base/class.c
---- linux-2.6.32.45/drivers/base/class.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/base/class.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/base/class.c linux-2.6.32.46/drivers/base/class.c
+--- linux-2.6.32.46/drivers/base/class.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/base/class.c	2011-04-17 15:56:46.000000000 -0400
 @@ -63,7 +63,7 @@ static void class_release(struct kobject
  	kfree(cp);
  }
@@ -27240,9 +27245,9 @@ diff -urNp linux-2.6.32.45/drivers/base/class.c linux-2.6.32.45/drivers/base/cla
  	.show	= class_attr_show,
  	.store	= class_attr_store,
  };
-diff -urNp linux-2.6.32.45/drivers/base/core.c linux-2.6.32.45/drivers/base/core.c
---- linux-2.6.32.45/drivers/base/core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/base/core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/base/core.c linux-2.6.32.46/drivers/base/core.c
+--- linux-2.6.32.46/drivers/base/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/base/core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
  	return ret;
  }
@@ -27261,9 +27266,9 @@ diff -urNp linux-2.6.32.45/drivers/base/core.c linux-2.6.32.45/drivers/base/core
  	.filter =	dev_uevent_filter,
  	.name =		dev_uevent_name,
  	.uevent =	dev_uevent,
-diff -urNp linux-2.6.32.45/drivers/base/memory.c linux-2.6.32.45/drivers/base/memory.c
---- linux-2.6.32.45/drivers/base/memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/base/memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/base/memory.c linux-2.6.32.46/drivers/base/memory.c
+--- linux-2.6.32.46/drivers/base/memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/base/memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
  	return retval;
  }
@@ -27273,9 +27278,9 @@ diff -urNp linux-2.6.32.45/drivers/base/memory.c linux-2.6.32.45/drivers/base/me
  	.name		= memory_uevent_name,
  	.uevent		= memory_uevent,
  };
-diff -urNp linux-2.6.32.45/drivers/base/sys.c linux-2.6.32.45/drivers/base/sys.c
---- linux-2.6.32.45/drivers/base/sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/base/sys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/base/sys.c linux-2.6.32.46/drivers/base/sys.c
+--- linux-2.6.32.46/drivers/base/sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/base/sys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
  	return -EIO;
  }
@@ -27294,9 +27299,9 @@ diff -urNp linux-2.6.32.45/drivers/base/sys.c linux-2.6.32.45/drivers/base/sys.c
  	.show	= sysdev_class_show,
  	.store	= sysdev_class_store,
  };
-diff -urNp linux-2.6.32.45/drivers/block/cciss.c linux-2.6.32.45/drivers/block/cciss.c
---- linux-2.6.32.45/drivers/block/cciss.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/cciss.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/cciss.c linux-2.6.32.46/drivers/block/cciss.c
+--- linux-2.6.32.46/drivers/block/cciss.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/block/cciss.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -27406,9 +27411,9 @@ diff -urNp linux-2.6.32.45/drivers/block/cciss.c linux-2.6.32.45/drivers/block/c
  
  	/* Get the firmware version */
  	inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
-diff -urNp linux-2.6.32.45/drivers/block/cciss.h linux-2.6.32.45/drivers/block/cciss.h
---- linux-2.6.32.45/drivers/block/cciss.h	2011-08-09 18:35:28.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/cciss.h	2011-08-09 18:33:59.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/cciss.h linux-2.6.32.46/drivers/block/cciss.h
+--- linux-2.6.32.46/drivers/block/cciss.h	2011-08-09 18:35:28.000000000 -0400
++++ linux-2.6.32.46/drivers/block/cciss.h	2011-08-09 18:33:59.000000000 -0400
 @@ -90,7 +90,7 @@ struct ctlr_info 
  	// information about each logical volume
  	drive_info_struct *drv[CISS_MAX_LUN];
@@ -27418,9 +27423,9 @@ diff -urNp linux-2.6.32.45/drivers/block/cciss.h linux-2.6.32.45/drivers/block/c
  
  	/* queue and queue Info */ 
  	struct hlist_head reqQ;
-diff -urNp linux-2.6.32.45/drivers/block/cpqarray.c linux-2.6.32.45/drivers/block/cpqarray.c
---- linux-2.6.32.45/drivers/block/cpqarray.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/cpqarray.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/cpqarray.c linux-2.6.32.46/drivers/block/cpqarray.c
+--- linux-2.6.32.46/drivers/block/cpqarray.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/block/cpqarray.c	2011-08-05 20:33:55.000000000 -0400
 @@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr
  	if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
  		goto Enomem4;
@@ -27546,9 +27551,9 @@ diff -urNp linux-2.6.32.45/drivers/block/cpqarray.c linux-2.6.32.45/drivers/bloc
  		if (done == 0) {
  			udelay(10);	/* a short fixed delay */
  		} else
-diff -urNp linux-2.6.32.45/drivers/block/cpqarray.h linux-2.6.32.45/drivers/block/cpqarray.h
---- linux-2.6.32.45/drivers/block/cpqarray.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/cpqarray.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/cpqarray.h linux-2.6.32.46/drivers/block/cpqarray.h
+--- linux-2.6.32.46/drivers/block/cpqarray.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/block/cpqarray.h	2011-08-05 20:33:55.000000000 -0400
 @@ -99,7 +99,7 @@ struct ctlr_info {
  	drv_info_t	drv[NWD];
  	struct proc_dir_entry *proc;
@@ -27558,9 +27563,9 @@ diff -urNp linux-2.6.32.45/drivers/block/cpqarray.h linux-2.6.32.45/drivers/bloc
  
  	cmdlist_t *reqQ;
  	cmdlist_t *cmpQ;
-diff -urNp linux-2.6.32.45/drivers/block/DAC960.c linux-2.6.32.45/drivers/block/DAC960.c
---- linux-2.6.32.45/drivers/block/DAC960.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/DAC960.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/DAC960.c linux-2.6.32.46/drivers/block/DAC960.c
+--- linux-2.6.32.46/drivers/block/DAC960.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/block/DAC960.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur
    unsigned long flags;
    int Channel, TargetID;
@@ -27570,9 +27575,9 @@ diff -urNp linux-2.6.32.45/drivers/block/DAC960.c linux-2.6.32.45/drivers/block/
    if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
  		DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
  			sizeof(DAC960_SCSI_Inquiry_T) +
-diff -urNp linux-2.6.32.45/drivers/block/nbd.c linux-2.6.32.45/drivers/block/nbd.c
---- linux-2.6.32.45/drivers/block/nbd.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/nbd.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/nbd.c linux-2.6.32.46/drivers/block/nbd.c
+--- linux-2.6.32.46/drivers/block/nbd.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/block/nbd.c	2011-06-25 12:56:37.000000000 -0400
 @@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device *
  	struct kvec iov;
  	sigset_t blocked, oldset;
@@ -27591,9 +27596,9 @@ diff -urNp linux-2.6.32.45/drivers/block/nbd.c linux-2.6.32.45/drivers/block/nbd
  	switch (cmd) {
  	case NBD_DISCONNECT: {
  		struct request sreq;
-diff -urNp linux-2.6.32.45/drivers/block/pktcdvd.c linux-2.6.32.45/drivers/block/pktcdvd.c
---- linux-2.6.32.45/drivers/block/pktcdvd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/block/pktcdvd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/block/pktcdvd.c linux-2.6.32.46/drivers/block/pktcdvd.c
+--- linux-2.6.32.46/drivers/block/pktcdvd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/block/pktcdvd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
  	return len;
  }
@@ -27603,9 +27608,9 @@ diff -urNp linux-2.6.32.45/drivers/block/pktcdvd.c linux-2.6.32.45/drivers/block
  	.show = kobj_pkt_show,
  	.store = kobj_pkt_store
  };
-diff -urNp linux-2.6.32.45/drivers/char/agp/frontend.c linux-2.6.32.45/drivers/char/agp/frontend.c
---- linux-2.6.32.45/drivers/char/agp/frontend.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/agp/frontend.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/agp/frontend.c linux-2.6.32.46/drivers/char/agp/frontend.c
+--- linux-2.6.32.46/drivers/char/agp/frontend.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/agp/frontend.c	2011-04-17 15:56:46.000000000 -0400
 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
@@ -27615,9 +27620,9 @@ diff -urNp linux-2.6.32.45/drivers/char/agp/frontend.c linux-2.6.32.45/drivers/c
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.32.45/drivers/char/briq_panel.c linux-2.6.32.45/drivers/char/briq_panel.c
---- linux-2.6.32.45/drivers/char/briq_panel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/briq_panel.c	2011-04-18 19:48:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/briq_panel.c linux-2.6.32.46/drivers/char/briq_panel.c
+--- linux-2.6.32.46/drivers/char/briq_panel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/briq_panel.c	2011-04-18 19:48:57.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -27659,9 +27664,9 @@ diff -urNp linux-2.6.32.45/drivers/char/briq_panel.c linux-2.6.32.45/drivers/cha
  
  	return len;
  }
-diff -urNp linux-2.6.32.45/drivers/char/genrtc.c linux-2.6.32.45/drivers/char/genrtc.c
---- linux-2.6.32.45/drivers/char/genrtc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/genrtc.c	2011-04-18 19:45:42.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/genrtc.c linux-2.6.32.46/drivers/char/genrtc.c
+--- linux-2.6.32.46/drivers/char/genrtc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/genrtc.c	2011-04-18 19:45:42.000000000 -0400
 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i
  	switch (cmd) {
  
@@ -27670,9 +27675,9 @@ diff -urNp linux-2.6.32.45/drivers/char/genrtc.c linux-2.6.32.45/drivers/char/ge
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-2.6.32.45/drivers/char/hpet.c linux-2.6.32.45/drivers/char/hpet.c
---- linux-2.6.32.45/drivers/char/hpet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hpet.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hpet.c linux-2.6.32.46/drivers/char/hpet.c
+--- linux-2.6.32.46/drivers/char/hpet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hpet.c	2011-04-23 12:56:11.000000000 -0400
 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
  	return 0;
  }
@@ -27705,9 +27710,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hpet.c linux-2.6.32.45/drivers/char/hpet
  			info.hi_flags =
  			    readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
  			info.hi_hpet = hpetp->hp_which;
-diff -urNp linux-2.6.32.45/drivers/char/hvc_beat.c linux-2.6.32.45/drivers/char/hvc_beat.c
---- linux-2.6.32.45/drivers/char/hvc_beat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_beat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_beat.c linux-2.6.32.46/drivers/char/hvc_beat.c
+--- linux-2.6.32.46/drivers/char/hvc_beat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_beat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
  	return cnt;
  }
@@ -27717,9 +27722,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_beat.c linux-2.6.32.45/drivers/char/
  	.get_chars = hvc_beat_get_chars,
  	.put_chars = hvc_beat_put_chars,
  };
-diff -urNp linux-2.6.32.45/drivers/char/hvc_console.c linux-2.6.32.45/drivers/char/hvc_console.c
---- linux-2.6.32.45/drivers/char/hvc_console.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_console.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_console.c linux-2.6.32.46/drivers/char/hvc_console.c
+--- linux-2.6.32.46/drivers/char/hvc_console.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_console.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
   * console interfaces but can still be used as a tty device.  This has to be
   * static because kmalloc will not work during early console init.
@@ -27747,9 +27752,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_console.c linux-2.6.32.45/drivers/ch
  {
  	struct hvc_struct *hp;
  	int i;
-diff -urNp linux-2.6.32.45/drivers/char/hvc_console.h linux-2.6.32.45/drivers/char/hvc_console.h
---- linux-2.6.32.45/drivers/char/hvc_console.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_console.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_console.h linux-2.6.32.46/drivers/char/hvc_console.h
+--- linux-2.6.32.46/drivers/char/hvc_console.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_console.h	2011-04-17 15:56:46.000000000 -0400
 @@ -55,7 +55,7 @@ struct hvc_struct {
  	int outbuf_size;
  	int n_outbuf;
@@ -27773,9 +27778,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_console.h linux-2.6.32.45/drivers/ch
  /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
  extern int hvc_remove(struct hvc_struct *hp);
  
-diff -urNp linux-2.6.32.45/drivers/char/hvc_iseries.c linux-2.6.32.45/drivers/char/hvc_iseries.c
---- linux-2.6.32.45/drivers/char/hvc_iseries.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_iseries.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_iseries.c linux-2.6.32.46/drivers/char/hvc_iseries.c
+--- linux-2.6.32.46/drivers/char/hvc_iseries.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_iseries.c	2011-04-17 15:56:46.000000000 -0400
 @@ -197,7 +197,7 @@ done:
  	return sent;
  }
@@ -27785,9 +27790,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_iseries.c linux-2.6.32.45/drivers/ch
  	.get_chars = get_chars,
  	.put_chars = put_chars,
  	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.45/drivers/char/hvc_iucv.c linux-2.6.32.45/drivers/char/hvc_iucv.c
---- linux-2.6.32.45/drivers/char/hvc_iucv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_iucv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_iucv.c linux-2.6.32.46/drivers/char/hvc_iucv.c
+--- linux-2.6.32.46/drivers/char/hvc_iucv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_iucv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru
  
  
@@ -27797,9 +27802,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_iucv.c linux-2.6.32.45/drivers/char/
  	.get_chars = hvc_iucv_get_chars,
  	.put_chars = hvc_iucv_put_chars,
  	.notifier_add = hvc_iucv_notifier_add,
-diff -urNp linux-2.6.32.45/drivers/char/hvc_rtas.c linux-2.6.32.45/drivers/char/hvc_rtas.c
---- linux-2.6.32.45/drivers/char/hvc_rtas.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_rtas.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_rtas.c linux-2.6.32.46/drivers/char/hvc_rtas.c
+--- linux-2.6.32.46/drivers/char/hvc_rtas.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_rtas.c	2011-04-17 15:56:46.000000000 -0400
 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
  	return i;
  }
@@ -27809,9 +27814,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_rtas.c linux-2.6.32.45/drivers/char/
  	.get_chars = hvc_rtas_read_console,
  	.put_chars = hvc_rtas_write_console,
  };
-diff -urNp linux-2.6.32.45/drivers/char/hvcs.c linux-2.6.32.45/drivers/char/hvcs.c
---- linux-2.6.32.45/drivers/char/hvcs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvcs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvcs.c linux-2.6.32.46/drivers/char/hvcs.c
+--- linux-2.6.32.46/drivers/char/hvcs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvcs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -82,6 +82,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -27914,9 +27919,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvcs.c linux-2.6.32.45/drivers/char/hvcs
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.45/drivers/char/hvc_udbg.c linux-2.6.32.45/drivers/char/hvc_udbg.c
---- linux-2.6.32.45/drivers/char/hvc_udbg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_udbg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_udbg.c linux-2.6.32.46/drivers/char/hvc_udbg.c
+--- linux-2.6.32.46/drivers/char/hvc_udbg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_udbg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
  	return i;
  }
@@ -27926,9 +27931,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_udbg.c linux-2.6.32.45/drivers/char/
  	.get_chars = hvc_udbg_get,
  	.put_chars = hvc_udbg_put,
  };
-diff -urNp linux-2.6.32.45/drivers/char/hvc_vio.c linux-2.6.32.45/drivers/char/hvc_vio.c
---- linux-2.6.32.45/drivers/char/hvc_vio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_vio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_vio.c linux-2.6.32.46/drivers/char/hvc_vio.c
+--- linux-2.6.32.46/drivers/char/hvc_vio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_vio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
  	return got;
  }
@@ -27938,9 +27943,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_vio.c linux-2.6.32.45/drivers/char/h
  	.get_chars = filtered_get_chars,
  	.put_chars = hvc_put_chars,
  	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.45/drivers/char/hvc_xen.c linux-2.6.32.45/drivers/char/hvc_xen.c
---- linux-2.6.32.45/drivers/char/hvc_xen.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/hvc_xen.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/hvc_xen.c linux-2.6.32.46/drivers/char/hvc_xen.c
+--- linux-2.6.32.46/drivers/char/hvc_xen.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_xen.c	2011-04-17 15:56:46.000000000 -0400
 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
  	return recv;
  }
@@ -27950,9 +27955,9 @@ diff -urNp linux-2.6.32.45/drivers/char/hvc_xen.c linux-2.6.32.45/drivers/char/h
  	.get_chars = read_console,
  	.put_chars = write_console,
  	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c	2011-05-16 21:46:57.000000000 -0400
 @@ -414,7 +414,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -27992,9 +27997,9 @@ diff -urNp linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.45/d
  	si = (struct ipmi_system_interface_addr *) &addr;
  	si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
  	si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/ipmi/ipmi_si_intf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -277,7 +277,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
@@ -28025,9 +28030,9 @@ diff -urNp linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.45/driv
  
  	new_smi->interrupt_disabled = 0;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.32.45/drivers/char/istallion.c linux-2.6.32.45/drivers/char/istallion.c
---- linux-2.6.32.45/drivers/char/istallion.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/istallion.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/istallion.c linux-2.6.32.46/drivers/char/istallion.c
+--- linux-2.6.32.46/drivers/char/istallion.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/istallion.c	2011-05-16 21:46:57.000000000 -0400
 @@ -187,7 +187,6 @@ static struct ktermios		stli_deftermios 
   *	re-used for each stats call.
   */
@@ -28062,9 +28067,9 @@ diff -urNp linux-2.6.32.45/drivers/char/istallion.c linux-2.6.32.45/drivers/char
  	if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
  		return -EFAULT;
  	if (stli_dummybrd.brdnr >= STL_MAXBRDS)
-diff -urNp linux-2.6.32.45/drivers/char/Kconfig linux-2.6.32.45/drivers/char/Kconfig
---- linux-2.6.32.45/drivers/char/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/Kconfig	2011-04-18 19:20:15.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/Kconfig linux-2.6.32.46/drivers/char/Kconfig
+--- linux-2.6.32.46/drivers/char/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/Kconfig	2011-04-18 19:20:15.000000000 -0400
 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
  
  config DEVKMEM
@@ -28083,9 +28088,9 @@ diff -urNp linux-2.6.32.45/drivers/char/Kconfig linux-2.6.32.45/drivers/char/Kco
  	default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-2.6.32.45/drivers/char/keyboard.c linux-2.6.32.45/drivers/char/keyboard.c
---- linux-2.6.32.45/drivers/char/keyboard.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/keyboard.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/keyboard.c linux-2.6.32.46/drivers/char/keyboard.c
+--- linux-2.6.32.46/drivers/char/keyboard.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/keyboard.c	2011-04-17 15:56:46.000000000 -0400
 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
  	     kbd->kbdmode == VC_MEDIUMRAW) &&
  	     value != KVAL(K_SAK))
@@ -28112,9 +28117,9 @@ diff -urNp linux-2.6.32.45/drivers/char/keyboard.c linux-2.6.32.45/drivers/char/
  };
  
  MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.32.45/drivers/char/mem.c linux-2.6.32.45/drivers/char/mem.c
---- linux-2.6.32.45/drivers/char/mem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/mem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/mem.c linux-2.6.32.46/drivers/char/mem.c
+--- linux-2.6.32.46/drivers/char/mem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/mem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -28256,9 +28261,9 @@ diff -urNp linux-2.6.32.45/drivers/char/mem.c linux-2.6.32.45/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/pcmcia/ipwireless/tty.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -28381,9 +28386,9 @@ diff -urNp linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.45/
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-2.6.32.45/drivers/char/pty.c linux-2.6.32.45/drivers/char/pty.c
---- linux-2.6.32.45/drivers/char/pty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/pty.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/pty.c linux-2.6.32.46/drivers/char/pty.c
+--- linux-2.6.32.46/drivers/char/pty.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/pty.c	2011-08-05 20:33:55.000000000 -0400
 @@ -736,8 +736,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
@@ -28396,9 +28401,9 @@ diff -urNp linux-2.6.32.45/drivers/char/pty.c linux-2.6.32.45/drivers/char/pty.c
  
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-diff -urNp linux-2.6.32.45/drivers/char/random.c linux-2.6.32.45/drivers/char/random.c
---- linux-2.6.32.45/drivers/char/random.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/random.c	2011-08-16 20:43:23.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/random.c linux-2.6.32.46/drivers/char/random.c
+--- linux-2.6.32.46/drivers/char/random.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/drivers/char/random.c	2011-08-16 20:43:23.000000000 -0400
 @@ -254,8 +254,13 @@
  /*
   * Configuration information
@@ -28440,9 +28445,9 @@ diff -urNp linux-2.6.32.45/drivers/char/random.c linux-2.6.32.45/drivers/char/ra
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-2.6.32.45/drivers/char/rocket.c linux-2.6.32.45/drivers/char/rocket.c
---- linux-2.6.32.45/drivers/char/rocket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/rocket.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/rocket.c linux-2.6.32.46/drivers/char/rocket.c
+--- linux-2.6.32.46/drivers/char/rocket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/rocket.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info
  	struct rocket_ports tmp;
  	int board;
@@ -28452,9 +28457,9 @@ diff -urNp linux-2.6.32.45/drivers/char/rocket.c linux-2.6.32.45/drivers/char/ro
  	if (!retports)
  		return -EFAULT;
  	memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-2.6.32.45/drivers/char/sonypi.c linux-2.6.32.45/drivers/char/sonypi.c
---- linux-2.6.32.45/drivers/char/sonypi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/sonypi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/sonypi.c linux-2.6.32.46/drivers/char/sonypi.c
+--- linux-2.6.32.46/drivers/char/sonypi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/sonypi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -28493,9 +28498,9 @@ diff -urNp linux-2.6.32.45/drivers/char/sonypi.c linux-2.6.32.45/drivers/char/so
  	mutex_unlock(&sonypi_device.lock);
  	unlock_kernel();
  	return 0;
-diff -urNp linux-2.6.32.45/drivers/char/stallion.c linux-2.6.32.45/drivers/char/stallion.c
---- linux-2.6.32.45/drivers/char/stallion.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/stallion.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/stallion.c linux-2.6.32.46/drivers/char/stallion.c
+--- linux-2.6.32.46/drivers/char/stallion.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/stallion.c	2011-05-16 21:46:57.000000000 -0400
 @@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlp
  	struct stlport	stl_dummyport;
  	struct stlport	*portp;
@@ -28505,9 +28510,9 @@ diff -urNp linux-2.6.32.45/drivers/char/stallion.c linux-2.6.32.45/drivers/char/
  	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
  		return -EFAULT;
  	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff -urNp linux-2.6.32.45/drivers/char/tpm/tpm_bios.c linux-2.6.32.45/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.45/drivers/char/tpm/tpm_bios.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/tpm/tpm_bios.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm_bios.c linux-2.6.32.46/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.32.46/drivers/char/tpm/tpm_bios.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/tpm/tpm_bios.c	2011-04-17 15:56:46.000000000 -0400
 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -28548,9 +28553,9 @@ diff -urNp linux-2.6.32.45/drivers/char/tpm/tpm_bios.c linux-2.6.32.45/drivers/c
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-2.6.32.45/drivers/char/tpm/tpm.c linux-2.6.32.45/drivers/char/tpm/tpm.c
---- linux-2.6.32.45/drivers/char/tpm/tpm.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/tpm/tpm.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/tpm/tpm.c
+--- linux-2.6.32.46/drivers/char/tpm/tpm.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/char/tpm/tpm.c	2011-05-16 21:46:57.000000000 -0400
 @@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c
  		    chip->vendor.req_complete_val)
  			goto out_recv;
@@ -28569,9 +28574,9 @@ diff -urNp linux-2.6.32.45/drivers/char/tpm/tpm.c linux-2.6.32.45/drivers/char/t
  	tpm_cmd.header.in = tpm_readpubek_header;
  	err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
  			"attempting to read the PUBEK");
-diff -urNp linux-2.6.32.45/drivers/char/tty_io.c linux-2.6.32.45/drivers/char/tty_io.c
---- linux-2.6.32.45/drivers/char/tty_io.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/tty_io.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tty_io.c
+--- linux-2.6.32.46/drivers/char/tty_io.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/tty_io.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2582,8 +2582,10 @@ long tty_ioctl(struct file *file, unsign
  	return retval;
  }
@@ -28602,9 +28607,9 @@ diff -urNp linux-2.6.32.45/drivers/char/tty_io.c linux-2.6.32.45/drivers/char/tt
  }
  
  /*
-diff -urNp linux-2.6.32.45/drivers/char/tty_ldisc.c linux-2.6.32.45/drivers/char/tty_ldisc.c
---- linux-2.6.32.45/drivers/char/tty_ldisc.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/tty_ldisc.c	2011-07-13 17:23:18.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/tty_ldisc.c linux-2.6.32.46/drivers/char/tty_ldisc.c
+--- linux-2.6.32.46/drivers/char/tty_ldisc.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/drivers/char/tty_ldisc.c	2011-07-13 17:23:18.000000000 -0400
 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
@@ -28650,9 +28655,9 @@ diff -urNp linux-2.6.32.45/drivers/char/tty_ldisc.c linux-2.6.32.45/drivers/char
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-2.6.32.45/drivers/char/virtio_console.c linux-2.6.32.45/drivers/char/virtio_console.c
---- linux-2.6.32.45/drivers/char/virtio_console.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/virtio_console.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/virtio_console.c linux-2.6.32.46/drivers/char/virtio_console.c
+--- linux-2.6.32.46/drivers/char/virtio_console.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/virtio_console.c	2011-08-05 20:33:55.000000000 -0400
 @@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char *
   * virtqueue, so we let the drivers do some boutique early-output thing. */
  int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
@@ -28683,9 +28688,9 @@ diff -urNp linux-2.6.32.45/drivers/char/virtio_console.c linux-2.6.32.45/drivers
  
  	/* The first argument of hvc_alloc() is the virtual console number, so
  	 * we use zero.  The second argument is the parameter for the
-diff -urNp linux-2.6.32.45/drivers/char/vt.c linux-2.6.32.45/drivers/char/vt.c
---- linux-2.6.32.45/drivers/char/vt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/vt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/vt.c linux-2.6.32.46/drivers/char/vt.c
+--- linux-2.6.32.46/drivers/char/vt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/vt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -28695,9 +28700,9 @@ diff -urNp linux-2.6.32.45/drivers/char/vt.c linux-2.6.32.45/drivers/char/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-2.6.32.45/drivers/char/vt_ioctl.c linux-2.6.32.45/drivers/char/vt_ioctl.c
---- linux-2.6.32.45/drivers/char/vt_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/char/vt_ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/char/vt_ioctl.c linux-2.6.32.46/drivers/char/vt_ioctl.c
+--- linux-2.6.32.46/drivers/char/vt_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/vt_ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
@@ -28741,9 +28746,9 @@ diff -urNp linux-2.6.32.45/drivers/char/vt_ioctl.c linux-2.6.32.45/drivers/char/
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-2.6.32.45/drivers/cpufreq/cpufreq.c linux-2.6.32.45/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.45/drivers/cpufreq/cpufreq.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/cpufreq/cpufreq.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/cpufreq/cpufreq.c linux-2.6.32.46/drivers/cpufreq/cpufreq.c
+--- linux-2.6.32.46/drivers/cpufreq/cpufreq.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/cpufreq/cpufreq.c	2011-06-25 12:56:37.000000000 -0400
 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
  	complete(&policy->kobj_unregister);
  }
@@ -28753,9 +28758,9 @@ diff -urNp linux-2.6.32.45/drivers/cpufreq/cpufreq.c linux-2.6.32.45/drivers/cpu
  	.show	= show,
  	.store	= store,
  };
-diff -urNp linux-2.6.32.45/drivers/cpuidle/sysfs.c linux-2.6.32.45/drivers/cpuidle/sysfs.c
---- linux-2.6.32.45/drivers/cpuidle/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/cpuidle/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/cpuidle/sysfs.c linux-2.6.32.46/drivers/cpuidle/sysfs.c
+--- linux-2.6.32.46/drivers/cpuidle/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/cpuidle/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
  	return ret;
  }
@@ -28783,9 +28788,9 @@ diff -urNp linux-2.6.32.45/drivers/cpuidle/sysfs.c linux-2.6.32.45/drivers/cpuid
  {
  	kobject_put(&device->kobjs[i]->kobj);
  	wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.32.45/drivers/crypto/hifn_795x.c linux-2.6.32.45/drivers/crypto/hifn_795x.c
---- linux-2.6.32.45/drivers/crypto/hifn_795x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/crypto/hifn_795x.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/crypto/hifn_795x.c linux-2.6.32.46/drivers/crypto/hifn_795x.c
+--- linux-2.6.32.46/drivers/crypto/hifn_795x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/crypto/hifn_795x.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
  		0xCA, 0x34, 0x2B, 0x2E};
  	struct scatterlist sg;
@@ -28795,9 +28800,9 @@ diff -urNp linux-2.6.32.45/drivers/crypto/hifn_795x.c linux-2.6.32.45/drivers/cr
  	memset(src, 0, sizeof(src));
  	memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-2.6.32.45/drivers/crypto/padlock-aes.c linux-2.6.32.45/drivers/crypto/padlock-aes.c
---- linux-2.6.32.45/drivers/crypto/padlock-aes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/crypto/padlock-aes.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/crypto/padlock-aes.c linux-2.6.32.46/drivers/crypto/padlock-aes.c
+--- linux-2.6.32.46/drivers/crypto/padlock-aes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/crypto/padlock-aes.c	2011-05-16 21:46:57.000000000 -0400
 @@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm
  	struct crypto_aes_ctx gen_aes;
  	int cpu;
@@ -28807,9 +28812,9 @@ diff -urNp linux-2.6.32.45/drivers/crypto/padlock-aes.c linux-2.6.32.45/drivers/
  	if (key_len % 8) {
  		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
  		return -EINVAL;
-diff -urNp linux-2.6.32.45/drivers/dma/ioat/dma.c linux-2.6.32.45/drivers/dma/ioat/dma.c
---- linux-2.6.32.45/drivers/dma/ioat/dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/dma/ioat/dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.c linux-2.6.32.46/drivers/dma/ioat/dma.c
+--- linux-2.6.32.46/drivers/dma/ioat/dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/dma/ioat/dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
  	return entry->show(&chan->common, page);
  }
@@ -28819,9 +28824,9 @@ diff -urNp linux-2.6.32.45/drivers/dma/ioat/dma.c linux-2.6.32.45/drivers/dma/io
  	.show	= ioat_attr_show,
  };
  
-diff -urNp linux-2.6.32.45/drivers/dma/ioat/dma.h linux-2.6.32.45/drivers/dma/ioat/dma.h
---- linux-2.6.32.45/drivers/dma/ioat/dma.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/dma/ioat/dma.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/dma/ioat/dma.h linux-2.6.32.46/drivers/dma/ioat/dma.h
+--- linux-2.6.32.46/drivers/dma/ioat/dma.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/dma/ioat/dma.h	2011-04-17 15:56:46.000000000 -0400
 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
  			   unsigned long *phys_complete);
  void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -28831,9 +28836,9 @@ diff -urNp linux-2.6.32.45/drivers/dma/ioat/dma.h linux-2.6.32.45/drivers/dma/io
  extern struct ioat_sysfs_entry ioat_version_attr;
  extern struct ioat_sysfs_entry ioat_cap_attr;
  #endif /* IOATDMA_H */
-diff -urNp linux-2.6.32.45/drivers/edac/edac_device_sysfs.c linux-2.6.32.45/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.45/drivers/edac/edac_device_sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/edac/edac_device_sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/edac/edac_device_sysfs.c linux-2.6.32.46/drivers/edac/edac_device_sysfs.c
+--- linux-2.6.32.46/drivers/edac/edac_device_sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/edac/edac_device_sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
  }
  
@@ -28861,9 +28866,9 @@ diff -urNp linux-2.6.32.45/drivers/edac/edac_device_sysfs.c linux-2.6.32.45/driv
  	.show = edac_dev_block_show,
  	.store = edac_dev_block_store
  };
-diff -urNp linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/edac/edac_mc_sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
  	return -EIO;
  }
@@ -28882,9 +28887,9 @@ diff -urNp linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c linux-2.6.32.45/drivers/
  	.show = mcidev_show,
  	.store = mcidev_store
  };
-diff -urNp linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c
+--- linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/edac/edac_pci_sysfs.c	2011-05-04 17:56:20.000000000 -0400
 @@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1;		/* log 
  static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000;	/* one second workq period */
@@ -28986,9 +28991,9 @@ diff -urNp linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c linux-2.6.32.45/drivers
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff -urNp linux-2.6.32.45/drivers/firewire/core-card.c linux-2.6.32.45/drivers/firewire/core-card.c
---- linux-2.6.32.45/drivers/firewire/core-card.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firewire/core-card.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firewire/core-card.c linux-2.6.32.46/drivers/firewire/core-card.c
+--- linux-2.6.32.46/drivers/firewire/core-card.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firewire/core-card.c	2011-08-23 21:22:32.000000000 -0400
 @@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref)
  
  void fw_core_remove_card(struct fw_card *card)
@@ -28998,9 +29003,9 @@ diff -urNp linux-2.6.32.45/drivers/firewire/core-card.c linux-2.6.32.45/drivers/
  
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-2.6.32.45/drivers/firewire/core-cdev.c linux-2.6.32.45/drivers/firewire/core-cdev.c
---- linux-2.6.32.45/drivers/firewire/core-cdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firewire/core-cdev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firewire/core-cdev.c linux-2.6.32.46/drivers/firewire/core-cdev.c
+--- linux-2.6.32.46/drivers/firewire/core-cdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firewire/core-cdev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
@@ -29011,9 +29016,9 @@ diff -urNp linux-2.6.32.45/drivers/firewire/core-cdev.c linux-2.6.32.45/drivers/
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.32.45/drivers/firewire/core.h linux-2.6.32.45/drivers/firewire/core.h
---- linux-2.6.32.45/drivers/firewire/core.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firewire/core.h	2011-08-23 20:24:26.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firewire/core.h linux-2.6.32.46/drivers/firewire/core.h
+--- linux-2.6.32.46/drivers/firewire/core.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firewire/core.h	2011-08-23 20:24:26.000000000 -0400
 @@ -86,6 +86,7 @@ struct fw_card_driver {
  
  	int (*stop_iso)(struct fw_iso_context *ctx);
@@ -29022,9 +29027,9 @@ diff -urNp linux-2.6.32.45/drivers/firewire/core.h linux-2.6.32.45/drivers/firew
  
  void fw_card_initialize(struct fw_card *card,
  		const struct fw_card_driver *driver, struct device *device);
-diff -urNp linux-2.6.32.45/drivers/firewire/core-transaction.c linux-2.6.32.45/drivers/firewire/core-transaction.c
---- linux-2.6.32.45/drivers/firewire/core-transaction.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firewire/core-transaction.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firewire/core-transaction.c linux-2.6.32.46/drivers/firewire/core-transaction.c
+--- linux-2.6.32.46/drivers/firewire/core-transaction.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firewire/core-transaction.c	2011-05-16 21:46:57.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <linux/string.h>
  #include <linux/timer.h>
@@ -29042,9 +29047,9 @@ diff -urNp linux-2.6.32.45/drivers/firewire/core-transaction.c linux-2.6.32.45/d
  	init_completion(&d.done);
  	d.payload = payload;
  	fw_send_request(card, &t, tcode, destination_id, generation, speed,
-diff -urNp linux-2.6.32.45/drivers/firmware/dmi_scan.c linux-2.6.32.45/drivers/firmware/dmi_scan.c
---- linux-2.6.32.45/drivers/firmware/dmi_scan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firmware/dmi_scan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firmware/dmi_scan.c linux-2.6.32.46/drivers/firmware/dmi_scan.c
+--- linux-2.6.32.46/drivers/firmware/dmi_scan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firmware/dmi_scan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -29057,9 +29062,9 @@ diff -urNp linux-2.6.32.45/drivers/firmware/dmi_scan.c linux-2.6.32.45/drivers/f
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff -urNp linux-2.6.32.45/drivers/firmware/edd.c linux-2.6.32.45/drivers/firmware/edd.c
---- linux-2.6.32.45/drivers/firmware/edd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firmware/edd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firmware/edd.c linux-2.6.32.46/drivers/firmware/edd.c
+--- linux-2.6.32.46/drivers/firmware/edd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firmware/edd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
  	return ret;
  }
@@ -29069,9 +29074,9 @@ diff -urNp linux-2.6.32.45/drivers/firmware/edd.c linux-2.6.32.45/drivers/firmwa
  	.show = edd_attr_show,
  };
  
-diff -urNp linux-2.6.32.45/drivers/firmware/efivars.c linux-2.6.32.45/drivers/firmware/efivars.c
---- linux-2.6.32.45/drivers/firmware/efivars.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firmware/efivars.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firmware/efivars.c linux-2.6.32.46/drivers/firmware/efivars.c
+--- linux-2.6.32.46/drivers/firmware/efivars.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firmware/efivars.c	2011-04-17 15:56:46.000000000 -0400
 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 
  	return ret;
  }
@@ -29081,9 +29086,9 @@ diff -urNp linux-2.6.32.45/drivers/firmware/efivars.c linux-2.6.32.45/drivers/fi
  	.show = efivar_attr_show,
  	.store = efivar_attr_store,
  };
-diff -urNp linux-2.6.32.45/drivers/firmware/iscsi_ibft.c linux-2.6.32.45/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.45/drivers/firmware/iscsi_ibft.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firmware/iscsi_ibft.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firmware/iscsi_ibft.c linux-2.6.32.46/drivers/firmware/iscsi_ibft.c
+--- linux-2.6.32.46/drivers/firmware/iscsi_ibft.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firmware/iscsi_ibft.c	2011-04-17 15:56:46.000000000 -0400
 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
  	return ret;
  }
@@ -29093,9 +29098,9 @@ diff -urNp linux-2.6.32.45/drivers/firmware/iscsi_ibft.c linux-2.6.32.45/drivers
  	.show = ibft_show_attribute,
  };
  
-diff -urNp linux-2.6.32.45/drivers/firmware/memmap.c linux-2.6.32.45/drivers/firmware/memmap.c
---- linux-2.6.32.45/drivers/firmware/memmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/firmware/memmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/firmware/memmap.c linux-2.6.32.46/drivers/firmware/memmap.c
+--- linux-2.6.32.46/drivers/firmware/memmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firmware/memmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
  	NULL
  };
@@ -29105,9 +29110,9 @@ diff -urNp linux-2.6.32.45/drivers/firmware/memmap.c linux-2.6.32.45/drivers/fir
  	.show = memmap_attr_show,
  };
  
-diff -urNp linux-2.6.32.45/drivers/gpio/vr41xx_giu.c linux-2.6.32.45/drivers/gpio/vr41xx_giu.c
---- linux-2.6.32.45/drivers/gpio/vr41xx_giu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpio/vr41xx_giu.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpio/vr41xx_giu.c linux-2.6.32.46/drivers/gpio/vr41xx_giu.c
+--- linux-2.6.32.46/drivers/gpio/vr41xx_giu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpio/vr41xx_giu.c	2011-05-04 17:56:28.000000000 -0400
 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
  	printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
  	       maskl, pendl, maskh, pendh);
@@ -29117,9 +29122,9 @@ diff -urNp linux-2.6.32.45/drivers/gpio/vr41xx_giu.c linux-2.6.32.45/drivers/gpi
  
  	return -EINVAL;
  }
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_crtc_helper.c	2011-05-16 21:46:57.000000000 -0400
 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
@@ -29138,9 +29143,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.32.45/dri
  	crtc->enabled = drm_helper_crtc_in_use(crtc);
  
  	if (!crtc->enabled)
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_drv.c linux-2.6.32.45/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_drv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_drv.c linux-2.6.32.46/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_drv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
  	char *kdata = NULL;
  
@@ -29150,9 +29155,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_drv.c linux-2.6.32.45/drivers/gpu
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_fops.c linux-2.6.32.45/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_fops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_fops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_fops.c linux-2.6.32.46/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_fops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_fops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -29204,9 +29209,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_fops.c linux-2.6.32.45/drivers/gp
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_gem.c linux-2.6.32.45/drivers/gpu/drm/drm_gem.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_gem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_gem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_gem.c linux-2.6.32.46/drivers/gpu/drm/drm_gem.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_gem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_gem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
  	spin_lock_init(&dev->object_name_lock);
  	idr_init(&dev->object_name_idr);
@@ -29240,9 +29245,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_gem.c linux-2.6.32.45/drivers/gpu
  	kfree(obj);
  }
  EXPORT_SYMBOL(drm_gem_object_free);
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_info.c linux-2.6.32.45/drivers/gpu/drm/drm_info.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_info.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_info.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_info.c linux-2.6.32.46/drivers/gpu/drm/drm_info.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_info.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_info.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
  	struct drm_local_map *map;
  	struct drm_map_list *r_list;
@@ -29322,9 +29327,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_info.c linux-2.6.32.45/drivers/gp
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -29334,9 +29339,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.45/drivers/g
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_lock.c linux-2.6.32.45/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.45/drivers/gpu/drm/drm_lock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/drm_lock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/drm_lock.c linux-2.6.32.46/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.32.46/drivers/gpu/drm/drm_lock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/drm_lock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
  		if (drm_lock_take(&master->lock, lock->context)) {
  			master->lock.file_priv = file_priv;
@@ -29355,9 +29360,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_lock.c linux-2.6.32.45/drivers/gp
  
  	/* kernel_context_switch isn't used by any of the x86 drm
  	 * modules but is required by the Sparc driver.
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i810/i810_dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
@@ -29380,9 +29385,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.45/drive
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i810/i810_drv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
  	int page_flipping;
  
@@ -29394,9 +29399,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.45/drive
  
  	int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i830/i830_drv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -115,8 +115,8 @@ typedef struct drm_i830_private {
  	int page_flipping;
  
@@ -29408,9 +29413,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.45/drive
  
  	int use_mi_batchbuffer_start;
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c
---- linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c
+--- linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_
  
  	I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
@@ -29466,9 +29471,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.45/drive
  	init_waitqueue_head(&dev_priv->irq_queue);
  }
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-17 15:56:46.000000000 -0400
 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
  	}
  }
@@ -29478,9 +29483,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.45/dri
  	.init = ch7017_init,
  	.detect = ch7017_detect,
  	.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
  	}
  }
@@ -29490,9 +29495,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.45/dri
  	.init = ch7xxx_init,
  	.detect = ch7xxx_detect,
  	.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h	2011-04-17 15:56:46.000000000 -0400
 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
  	 *
  	 * \return singly-linked list of modes or NULL if no modes found.
@@ -29525,9 +29530,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h linux-2.6.32.45/drivers/gp
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
  	}
  }
@@ -29537,9 +29542,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.45/drive
  	.init = ivch_init,
  	.dpms = ivch_dpms,
  	.save = ivch_save,
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_sil164.c	2011-04-17 15:56:46.000000000 -0400
 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
  	}
  }
@@ -29549,9 +29554,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.45/dri
  	.init = sil164_init,
  	.detect = sil164_detect,
  	.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_tfp410.c	2011-04-17 15:56:46.000000000 -0400
 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
  	}
  }
@@ -29561,9 +29566,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.45/dri
  	.init = tfp410_init,
  	.detect = tfp410_detect,
  	.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_debugfs.c	2011-05-04 17:56:28.000000000 -0400
 @@ -192,7 +192,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
@@ -29573,9 +29578,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6.32.45/d
  	if (dev_priv->hw_status_page != NULL) {
  		seq_printf(m, "Current sequence:    %d\n",
  			   i915_get_gem_seqno(dev));
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
  	return i915_resume(dev);
  }
@@ -29585,9 +29590,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.45/drive
  	.fault = i915_gem_fault,
  	.open = drm_gem_vm_open,
  	.close = drm_gem_vm_close,
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_drv.h	2011-08-05 20:33:55.000000000 -0400
 @@ -168,7 +168,7 @@ struct drm_i915_display_funcs {
  	/* display clock increase/decrease */
  	/* pll clock increase/decrease */
@@ -29606,9 +29611,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.45/drive
  	/** Protects user_irq_refcount and irq_mask_reg */
  	spinlock_t user_irq_lock;
  	/** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_gem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d
  
  	args->aper_size = dev->gtt_total;
@@ -29691,9 +29696,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.45/drive
  	}
  	i915_verify_inactive(dev, __FILE__, __LINE__);
  }
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/i915_irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_
  	int irq_received;
  	int ret = IRQ_NONE;
@@ -29712,9 +29717,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.45/drive
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c
---- linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/intel_sdvo.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device *
  	sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device);
  
@@ -29726,9 +29731,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.32.45/dri
  
  	/* Read the regs to test if we can talk to the device */
  	for (i = 0; i < 0x40; i++) {
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/mga/mga_drv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
  	u32 clear_cmd;
  	u32 maccess;
@@ -29741,9 +29746,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.45/drivers
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c
---- linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c
+--- linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/mga/mga_irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -29780,9 +29785,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.45/drivers
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c
---- linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c
+--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_cce.c	2011-05-04 17:56:28.000000000 -0400
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
  	/* GH: Simple idle check.
@@ -29792,9 +29797,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.45/drive
  
  	/* We don't support anything other than bus-mastering ring mode,
  	 * but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_drv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
  	int is_pci;
  	unsigned long cce_buffers_offset;
@@ -29812,9 +29817,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.45/drive
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c
---- linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c
+--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
  	if (crtc != 0)
  		return 0;
@@ -29833,9 +29838,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.45/drive
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c
---- linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c
+--- linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/r128/r128_state.c	2011-05-04 17:56:28.000000000 -0400
 @@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
@@ -29849,9 +29854,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c linux-2.6.32.45/dri
  	}
  }
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/atom.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct c
  	char name[512];
  	int i;
@@ -29861,9 +29866,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c linux-2.6.32.45/drivers
  	ctx->card = card;
  	ctx->bios = bios;
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c	2011-04-17 15:56:46.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
@@ -29881,9 +29886,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.45/d
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c	2011-05-16 21:46:57.000000000 -0400
 @@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from
  	bool linkb;
  	struct radeon_i2c_bus_rec ddc_bus;
@@ -29917,9 +29922,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
  
  	atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_display.c	2011-04-17 15:56:46.000000000 -0400
 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
  
  					if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -29929,9 +29934,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
  					} else
  						error = abs(current_freq - freq);
  					vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_drv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -253,7 +253,7 @@ typedef struct drm_radeon_private {
  
  	/* SW interrupt */
@@ -29941,9 +29946,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6.32.45/d
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c	2011-05-04 17:56:28.000000000 -0400
 @@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_devi
  		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
  		return 0;
@@ -29962,9 +29967,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.45
  	INIT_LIST_HEAD(&rdev->fence_drv.created);
  	INIT_LIST_HEAD(&rdev->fence_drv.emited);
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h	2011-08-05 20:33:55.000000000 -0400
 @@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device 
   */
  struct radeon_fence_driver {
@@ -29983,9 +29988,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.45/drive
  
  /*
   * Asic structures
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-23 13:57:24.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-23 13:57:24.000000000 -0400
 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str
  	request = compat_alloc_user_space(sizeof(*request));
  	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -29995,9 +30000,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.45
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
  	unsigned int ret;
  	RING_LOCALS;
@@ -30018,9 +30023,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6.32.45/d
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_state.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -30030,9 +30035,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.45
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ttm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
  	DRM_INFO("radeon: ttm finalized\n");
  }
@@ -30084,9 +30089,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.45/d
  }
  
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c
---- linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/rs690.c	2011-04-17 15:56:46.000000000 -0400
 @@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct
  		if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
  			rdev->pm.sideport_bandwidth.full)
@@ -30100,9 +30105,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.45/driver
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo.c	2011-08-29 22:25:07.000000000 -0400
 @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
  	NULL
  };
@@ -30112,9 +30117,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.45/drivers/
  	.show = &ttm_bo_global_show
  };
  
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_bo_vm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
  {
  	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -30135,9 +30140,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.45/drive
  	/*
  	 * Work around locking order reversal in fault / nopfn
  	 * between mmap_sem and bo_reserve: Perform a trylock operation
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_global.c	2011-04-17 15:56:46.000000000 -0400
 @@ -36,7 +36,7 @@
  struct ttm_global_item {
  	struct mutex mutex;
@@ -30195,9 +30200,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.45/driv
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c
+--- linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/ttm/ttm_memory.c	2011-04-17 15:56:46.000000000 -0400
 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
  	NULL
  };
@@ -30207,9 +30212,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.45/driv
  	.show = &ttm_mem_zone_show,
  	.store = &ttm_mem_zone_store
  };
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h
---- linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h
+--- linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/via/via_drv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -30228,9 +30233,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h linux-2.6.32.45/drivers
  	drm_via_state_t hc_state;
  	char pci_buf[VIA_PCI_BUF_SIZE];
  	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c
---- linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c
+--- linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/via/via_irq.c	2011-05-04 17:56:28.000000000 -0400
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -30301,9 +30306,9 @@ diff -urNp linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c linux-2.6.32.45/drivers
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff -urNp linux-2.6.32.45/drivers/hid/hid-core.c linux-2.6.32.45/drivers/hid/hid-core.c
---- linux-2.6.32.45/drivers/hid/hid-core.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/hid/hid-core.c	2011-05-10 22:12:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/hid/hid-core.c linux-2.6.32.46/drivers/hid/hid-core.c
+--- linux-2.6.32.46/drivers/hid/hid-core.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/hid/hid-core.c	2011-05-10 22:12:32.000000000 -0400
 @@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
@@ -30322,9 +30327,9 @@ diff -urNp linux-2.6.32.45/drivers/hid/hid-core.c linux-2.6.32.45/drivers/hid/hi
  
  	ret = device_add(&hdev->dev);
  	if (!ret)
-diff -urNp linux-2.6.32.45/drivers/hid/usbhid/hiddev.c linux-2.6.32.45/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.45/drivers/hid/usbhid/hiddev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/hid/usbhid/hiddev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/hid/usbhid/hiddev.c linux-2.6.32.46/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.32.46/drivers/hid/usbhid/hiddev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/hid/usbhid/hiddev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
  		return put_user(HID_VERSION, (int __user *)arg);
  
@@ -30334,9 +30339,9 @@ diff -urNp linux-2.6.32.45/drivers/hid/usbhid/hiddev.c linux-2.6.32.45/drivers/h
  			return -EINVAL;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.32.45/drivers/hwmon/lis3lv02d.c linux-2.6.32.45/drivers/hwmon/lis3lv02d.c
---- linux-2.6.32.45/drivers/hwmon/lis3lv02d.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/hwmon/lis3lv02d.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.c linux-2.6.32.46/drivers/hwmon/lis3lv02d.c
+--- linux-2.6.32.46/drivers/hwmon/lis3lv02d.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/hwmon/lis3lv02d.c	2011-05-04 17:56:28.000000000 -0400
 @@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(in
  	 * the lid is closed. This leads to interrupts as soon as a little move
  	 * is done.
@@ -30373,9 +30378,9 @@ diff -urNp linux-2.6.32.45/drivers/hwmon/lis3lv02d.c linux-2.6.32.45/drivers/hwm
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-diff -urNp linux-2.6.32.45/drivers/hwmon/lis3lv02d.h linux-2.6.32.45/drivers/hwmon/lis3lv02d.h
---- linux-2.6.32.45/drivers/hwmon/lis3lv02d.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/hwmon/lis3lv02d.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/hwmon/lis3lv02d.h linux-2.6.32.46/drivers/hwmon/lis3lv02d.h
+--- linux-2.6.32.46/drivers/hwmon/lis3lv02d.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/hwmon/lis3lv02d.h	2011-05-04 17:56:28.000000000 -0400
 @@ -201,7 +201,7 @@ struct lis3lv02d {
  
  	struct input_polled_dev	*idev;     /* input device */
@@ -30385,9 +30390,9 @@ diff -urNp linux-2.6.32.45/drivers/hwmon/lis3lv02d.h linux-2.6.32.45/drivers/hwm
  	int			xcalib;    /* calibrated null value for x */
  	int			ycalib;    /* calibrated null value for y */
  	int			zcalib;    /* calibrated null value for z */
-diff -urNp linux-2.6.32.45/drivers/hwmon/sht15.c linux-2.6.32.45/drivers/hwmon/sht15.c
---- linux-2.6.32.45/drivers/hwmon/sht15.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/hwmon/sht15.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/hwmon/sht15.c linux-2.6.32.46/drivers/hwmon/sht15.c
+--- linux-2.6.32.46/drivers/hwmon/sht15.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/hwmon/sht15.c	2011-05-04 17:56:28.000000000 -0400
 @@ -112,7 +112,7 @@ struct sht15_data {
  	int				supply_uV;
  	int				supply_uV_valid;
@@ -30436,9 +30441,9 @@ diff -urNp linux-2.6.32.45/drivers/hwmon/sht15.c linux-2.6.32.45/drivers/hwmon/s
  			return;
  	}
  	/* Read the data back from the device */
-diff -urNp linux-2.6.32.45/drivers/hwmon/w83791d.c linux-2.6.32.45/drivers/hwmon/w83791d.c
---- linux-2.6.32.45/drivers/hwmon/w83791d.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/hwmon/w83791d.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/hwmon/w83791d.c linux-2.6.32.46/drivers/hwmon/w83791d.c
+--- linux-2.6.32.46/drivers/hwmon/w83791d.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/hwmon/w83791d.c	2011-04-17 15:56:46.000000000 -0400
 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
  			  struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
@@ -30450,9 +30455,9 @@ diff -urNp linux-2.6.32.45/drivers/hwmon/w83791d.c linux-2.6.32.45/drivers/hwmon
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-23 21:22:32.000000000 -0400
 @@ -43,7 +43,7 @@
  extern struct i2c_adapter amd756_smbus;
  
@@ -30462,9 +30467,9 @@ diff -urNp linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c linux-2.6.32.45
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-23 21:22:32.000000000 -0400
 @@ -41,7 +41,7 @@
  extern struct i2c_adapter *nforce2_smbus;
  
@@ -30474,9 +30479,9 @@ diff -urNp linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c linux-2.6.32.4
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-2.6.32.45/drivers/ide/ide-cd.c linux-2.6.32.45/drivers/ide/ide-cd.c
---- linux-2.6.32.45/drivers/ide/ide-cd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ide/ide-cd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ide/ide-cd.c linux-2.6.32.46/drivers/ide/ide-cd.c
+--- linux-2.6.32.46/drivers/ide/ide-cd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ide/ide-cd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
@@ -30486,9 +30491,9 @@ diff -urNp linux-2.6.32.45/drivers/ide/ide-cd.c linux-2.6.32.45/drivers/ide/ide-
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-2.6.32.45/drivers/ide/ide-floppy.c linux-2.6.32.45/drivers/ide/ide-floppy.c
---- linux-2.6.32.45/drivers/ide/ide-floppy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ide/ide-floppy.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ide/ide-floppy.c linux-2.6.32.46/drivers/ide/ide-floppy.c
+--- linux-2.6.32.46/drivers/ide/ide-floppy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ide/ide-floppy.c	2011-05-16 21:46:57.000000000 -0400
 @@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_d
  	u8 pc_buf[256], header_len, desc_cnt;
  	int i, rc = 1, blocks, length;
@@ -30498,9 +30503,9 @@ diff -urNp linux-2.6.32.45/drivers/ide/ide-floppy.c linux-2.6.32.45/drivers/ide/
  	ide_debug_log(IDE_DBG_FUNC, "enter");
  
  	drive->bios_cyl = 0;
-diff -urNp linux-2.6.32.45/drivers/ide/setup-pci.c linux-2.6.32.45/drivers/ide/setup-pci.c
---- linux-2.6.32.45/drivers/ide/setup-pci.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ide/setup-pci.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ide/setup-pci.c linux-2.6.32.46/drivers/ide/setup-pci.c
+--- linux-2.6.32.46/drivers/ide/setup-pci.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ide/setup-pci.c	2011-05-16 21:46:57.000000000 -0400
 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
  	int ret, i, n_ports = dev2 ? 4 : 2;
  	struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -30510,9 +30515,9 @@ diff -urNp linux-2.6.32.45/drivers/ide/setup-pci.c linux-2.6.32.45/drivers/ide/s
  	for (i = 0; i < n_ports / 2; i++) {
  		ret = ide_setup_pci_controller(pdev[i], d, !i);
  		if (ret < 0)
-diff -urNp linux-2.6.32.45/drivers/ieee1394/dv1394.c linux-2.6.32.45/drivers/ieee1394/dv1394.c
---- linux-2.6.32.45/drivers/ieee1394/dv1394.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ieee1394/dv1394.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ieee1394/dv1394.c linux-2.6.32.46/drivers/ieee1394/dv1394.c
+--- linux-2.6.32.46/drivers/ieee1394/dv1394.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ieee1394/dv1394.c	2011-04-23 12:56:11.000000000 -0400
 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
  	based upon DIF section and sequence
  */
@@ -30522,9 +30527,9 @@ diff -urNp linux-2.6.32.45/drivers/ieee1394/dv1394.c linux-2.6.32.45/drivers/iee
  frame_put_packet (struct frame *f, struct packet *p)
  {
  	int section_type = p->data[0] >> 5;           /* section type is in bits 5 - 7 */
-diff -urNp linux-2.6.32.45/drivers/ieee1394/hosts.c linux-2.6.32.45/drivers/ieee1394/hosts.c
---- linux-2.6.32.45/drivers/ieee1394/hosts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ieee1394/hosts.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ieee1394/hosts.c linux-2.6.32.46/drivers/ieee1394/hosts.c
+--- linux-2.6.32.46/drivers/ieee1394/hosts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ieee1394/hosts.c	2011-04-17 15:56:46.000000000 -0400
 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 
  }
  
@@ -30533,9 +30538,9 @@ diff -urNp linux-2.6.32.45/drivers/ieee1394/hosts.c linux-2.6.32.45/drivers/ieee
  	.transmit_packet = dummy_transmit_packet,
  	.devctl =	   dummy_devctl,
  	.isoctl =	   dummy_isoctl
-diff -urNp linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c
---- linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c
+--- linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ieee1394/init_ohci1394_dma.c	2011-04-17 15:56:46.000000000 -0400
 @@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con
  			for (func = 0; func < 8; func++) {
  				u32 class = read_pci_config(num,slot,func,
@@ -30545,9 +30550,9 @@ diff -urNp linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c linux-2.6.32.45/
  					continue; /* No device at this func */
  
  				if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
-diff -urNp linux-2.6.32.45/drivers/ieee1394/ohci1394.c linux-2.6.32.45/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.45/drivers/ieee1394/ohci1394.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ieee1394/ohci1394.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ieee1394/ohci1394.c linux-2.6.32.46/drivers/ieee1394/ohci1394.c
+--- linux-2.6.32.46/drivers/ieee1394/ohci1394.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ieee1394/ohci1394.c	2011-04-23 12:56:11.000000000 -0400
 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
  printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
  
@@ -30560,9 +30565,9 @@ diff -urNp linux-2.6.32.45/drivers/ieee1394/ohci1394.c linux-2.6.32.45/drivers/i
  
  static void dma_trm_tasklet(unsigned long data);
  static void dma_trm_reset(struct dma_trm_ctx *d);
-diff -urNp linux-2.6.32.45/drivers/ieee1394/sbp2.c linux-2.6.32.45/drivers/ieee1394/sbp2.c
---- linux-2.6.32.45/drivers/ieee1394/sbp2.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/ieee1394/sbp2.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/ieee1394/sbp2.c linux-2.6.32.46/drivers/ieee1394/sbp2.c
+--- linux-2.6.32.46/drivers/ieee1394/sbp2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ieee1394/sbp2.c	2011-04-23 12:56:11.000000000 -0400
 @@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot
  MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
  MODULE_LICENSE("GPL");
@@ -30572,9 +30577,9 @@ diff -urNp linux-2.6.32.45/drivers/ieee1394/sbp2.c linux-2.6.32.45/drivers/ieee1
  {
  	int ret;
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/core/cm.c linux-2.6.32.45/drivers/infiniband/core/cm.c
---- linux-2.6.32.45/drivers/infiniband/core/cm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/core/cm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/core/cm.c linux-2.6.32.46/drivers/infiniband/core/cm.c
+--- linux-2.6.32.46/drivers/infiniband/core/cm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/core/cm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,7 +112,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -30718,9 +30723,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/core/cm.c linux-2.6.32.45/drivers/
  	.show = cm_show_counter
  };
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c
---- linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c
+--- linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/core/fmr_pool.c	2011-05-04 17:56:28.000000000 -0400
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
  	struct task_struct       *thread;
@@ -30788,9 +30793,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c linux-2.6.32.45/dr
  				wake_up_process(pool->thread);
  			}
  		}
-diff -urNp linux-2.6.32.45/drivers/infiniband/core/sysfs.c linux-2.6.32.45/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.45/drivers/infiniband/core/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/core/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/core/sysfs.c linux-2.6.32.46/drivers/infiniband/core/sysfs.c
+--- linux-2.6.32.46/drivers/infiniband/core/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/core/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
  	return port_attr->show(p, port_attr, buf);
  }
@@ -30800,9 +30805,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/core/sysfs.c linux-2.6.32.45/drive
  	.show = port_attr_show
  };
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c
---- linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c
+--- linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/core/uverbs_marshall.c	2011-04-17 15:56:46.000000000 -0400
 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u
  	dst->grh.sgid_index        = src->grh.sgid_index;
  	dst->grh.hop_limit         = src->grh.hop_limit;
@@ -30833,9 +30838,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c linux-2.6.3
  }
  EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/ipath/ipath_fs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(stru
  	struct infinipath_counters counters;
  	struct ipath_devdata *dd;
@@ -30845,9 +30850,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c linux-2.6.32.4
  	dd = file->f_path.dentry->d_inode->i_private;
  	dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c
---- linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c
+--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c	2011-05-04 17:56:28.000000000 -0400
 @@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -30866,9 +30871,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c linux-2.6.32.45/drive
  
  	/* Free the control structures */
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c
---- linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c	2011-05-04 17:56:28.000000000 -0400
 @@ -69,11 +69,11 @@ u32 cm_packets_received;
  u32 cm_listens_created;
  u32 cm_listens_destroyed;
@@ -31042,9 +31047,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.45/dr
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h
---- linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h
+--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h	2011-05-04 17:56:28.000000000 -0400
 @@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -31091,9 +31096,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h linux-2.6.32.45/drive
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c
---- linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c	2011-05-04 17:56:28.000000000 -0400
 @@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
@@ -31140,9 +31145,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.45/d
  	target_stat_values[++index] = int_mod_timer_init;
  	target_stat_values[++index] = int_mod_cq_depth_1;
  	target_stat_values[++index] = int_mod_cq_depth_4;
-diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_verbs.c	2011-05-04 17:56:28.000000000 -0400
 @@ -45,9 +45,9 @@
  
  #include <rdma/ib_umem.h>
@@ -31174,9 +31179,9 @@ diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c linux-2.6.32.45
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff -urNp linux-2.6.32.45/drivers/input/gameport/gameport.c linux-2.6.32.45/drivers/input/gameport/gameport.c
---- linux-2.6.32.45/drivers/input/gameport/gameport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/input/gameport/gameport.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/input/gameport/gameport.c linux-2.6.32.46/drivers/input/gameport/gameport.c
+--- linux-2.6.32.46/drivers/input/gameport/gameport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/input/gameport/gameport.c	2011-05-04 17:56:28.000000000 -0400
 @@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -31193,9 +31198,9 @@ diff -urNp linux-2.6.32.45/drivers/input/gameport/gameport.c linux-2.6.32.45/dri
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff -urNp linux-2.6.32.45/drivers/input/input.c linux-2.6.32.45/drivers/input/input.c
---- linux-2.6.32.45/drivers/input/input.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/input/input.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/input/input.c linux-2.6.32.46/drivers/input/input.c
+--- linux-2.6.32.46/drivers/input/input.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/input/input.c	2011-05-04 17:56:28.000000000 -0400
 @@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability);
   */
  int input_register_device(struct input_dev *dev)
@@ -31214,9 +31219,9 @@ diff -urNp linux-2.6.32.45/drivers/input/input.c linux-2.6.32.45/drivers/input/i
  
  	error = device_add(&dev->dev);
  	if (error)
-diff -urNp linux-2.6.32.45/drivers/input/joystick/sidewinder.c linux-2.6.32.45/drivers/input/joystick/sidewinder.c
---- linux-2.6.32.45/drivers/input/joystick/sidewinder.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/input/joystick/sidewinder.c	2011-05-18 20:09:36.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/input/joystick/sidewinder.c linux-2.6.32.46/drivers/input/joystick/sidewinder.c
+--- linux-2.6.32.46/drivers/input/joystick/sidewinder.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/input/joystick/sidewinder.c	2011-05-18 20:09:36.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -31234,9 +31239,9 @@ diff -urNp linux-2.6.32.45/drivers/input/joystick/sidewinder.c linux-2.6.32.45/d
  	i = sw_read_packet(sw->gameport, buf, sw->length, 0);
  
  	if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) {		/* Broken packet, try to fix */
-diff -urNp linux-2.6.32.45/drivers/input/joystick/xpad.c linux-2.6.32.45/drivers/input/joystick/xpad.c
---- linux-2.6.32.45/drivers/input/joystick/xpad.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/input/joystick/xpad.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/input/joystick/xpad.c linux-2.6.32.46/drivers/input/joystick/xpad.c
+--- linux-2.6.32.46/drivers/input/joystick/xpad.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/input/joystick/xpad.c	2011-05-04 17:56:28.000000000 -0400
 @@ -621,7 +621,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
@@ -31255,9 +31260,9 @@ diff -urNp linux-2.6.32.45/drivers/input/joystick/xpad.c linux-2.6.32.45/drivers
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff -urNp linux-2.6.32.45/drivers/input/serio/serio.c linux-2.6.32.45/drivers/input/serio/serio.c
---- linux-2.6.32.45/drivers/input/serio/serio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/input/serio/serio.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/input/serio/serio.c linux-2.6.32.46/drivers/input/serio/serio.c
+--- linux-2.6.32.46/drivers/input/serio/serio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/input/serio/serio.c	2011-05-04 17:56:28.000000000 -0400
 @@ -527,7 +527,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -31276,9 +31281,9 @@ diff -urNp linux-2.6.32.45/drivers/input/serio/serio.c linux-2.6.32.45/drivers/i
  	serio->dev.bus = &serio_bus;
  	serio->dev.release = serio_release_port;
  	if (serio->parent) {
-diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/common.c linux-2.6.32.45/drivers/isdn/gigaset/common.c
---- linux-2.6.32.45/drivers/isdn/gigaset/common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/gigaset/common.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/common.c linux-2.6.32.46/drivers/isdn/gigaset/common.c
+--- linux-2.6.32.46/drivers/isdn/gigaset/common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/gigaset/common.c	2011-04-17 15:56:46.000000000 -0400
 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
@@ -31288,9 +31293,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/common.c linux-2.6.32.45/drivers
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/gigaset/gigaset.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -31308,9 +31313,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h linux-2.6.32.45/driver
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/interface.c linux-2.6.32.45/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.45/drivers/isdn/gigaset/interface.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/gigaset/interface.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/gigaset/interface.c linux-2.6.32.46/drivers/isdn/gigaset/interface.c
+--- linux-2.6.32.46/drivers/isdn/gigaset/interface.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/gigaset/interface.c	2011-04-17 15:56:46.000000000 -0400
 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
  		return -ERESTARTSYS; // FIXME -EINTR?
  	tty->driver_data = cs;
@@ -31398,9 +31403,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/interface.c linux-2.6.32.45/driv
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/avm/b1.c	2011-04-17 15:56:46.000000000 -0400
 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
@@ -31419,9 +31424,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c linux-2.6.32.45/driver
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/capidtmf.c	2011-05-16 21:46:57.000000000 -0400
 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
    byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
      short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
@@ -31430,9 +31435,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c linux-2.6.32.4
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/capifunc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31442,9 +31447,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c linux-2.6.32.4
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/diddfunc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31454,9 +31459,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c linux-2.6.32.4
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/divasfunc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31466,9 +31471,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c linux-2.6.32.
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/divasync.h	2011-08-05 20:33:55.000000000 -0400
 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
  } diva_didd_add_adapter_t;
  typedef struct _diva_didd_remove_adapter {
@@ -31478,9 +31483,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h linux-2.6.32.4
  typedef struct _diva_didd_read_adapter_array {
   void   * buffer;
   dword length;
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/idifunc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31490,9 +31495,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c linux-2.6.32.45
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/message.c	2011-05-16 21:46:57.000000000 -0400
 @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
@@ -31529,9 +31534,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c linux-2.6.32.45
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/mntfunc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -31541,9 +31546,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c linux-2.6.32.45
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-05 20:33:55.000000000 -0400
 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
  typedef struct _diva_os_idi_adapter_interface {
  	diva_init_card_proc_t cleanup_adapter_proc;
@@ -31553,9 +31558,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h linux-2.6.3
  
  typedef struct _diva_os_xdi_adapter {
  	struct list_head link;
-diff -urNp linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c
---- linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c
+--- linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/i4l/isdn_common.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct f
  	} iocpar;
  	void __user *argp = (void __user *)arg;
@@ -31565,9 +31570,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c linux-2.6.32.45/driver
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-2.6.32.45/drivers/isdn/icn/icn.c linux-2.6.32.45/drivers/isdn/icn/icn.c
---- linux-2.6.32.45/drivers/isdn/icn/icn.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/icn/icn.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/icn/icn.c linux-2.6.32.46/drivers/isdn/icn/icn.c
+--- linux-2.6.32.46/drivers/isdn/icn/icn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/icn/icn.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
@@ -31577,9 +31582,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/icn/icn.c linux-2.6.32.45/drivers/isdn/i
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-2.6.32.45/drivers/isdn/mISDN/socket.c linux-2.6.32.45/drivers/isdn/mISDN/socket.c
---- linux-2.6.32.45/drivers/isdn/mISDN/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/mISDN/socket.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/mISDN/socket.c linux-2.6.32.46/drivers/isdn/mISDN/socket.c
+--- linux-2.6.32.46/drivers/isdn/mISDN/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/mISDN/socket.c	2011-04-17 15:56:46.000000000 -0400
 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns
  		if (dev) {
  			struct mISDN_devinfo di;
@@ -31596,9 +31601,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/mISDN/socket.c linux-2.6.32.45/drivers/i
  			di.id = dev->id;
  			di.Dprotocols = dev->Dprotocols;
  			di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
-diff -urNp linux-2.6.32.45/drivers/isdn/sc/interrupt.c linux-2.6.32.45/drivers/isdn/sc/interrupt.c
---- linux-2.6.32.45/drivers/isdn/sc/interrupt.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/isdn/sc/interrupt.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/isdn/sc/interrupt.c linux-2.6.32.46/drivers/isdn/sc/interrupt.c
+--- linux-2.6.32.46/drivers/isdn/sc/interrupt.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/isdn/sc/interrupt.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
  			}
  			else if(callid>=0x0000 && callid<=0x7FFF)
@@ -31633,9 +31638,9 @@ diff -urNp linux-2.6.32.45/drivers/isdn/sc/interrupt.c linux-2.6.32.45/drivers/i
  			continue;
  		}
  			
-diff -urNp linux-2.6.32.45/drivers/lguest/core.c linux-2.6.32.45/drivers/lguest/core.c
---- linux-2.6.32.45/drivers/lguest/core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/lguest/core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/lguest/core.c linux-2.6.32.46/drivers/lguest/core.c
+--- linux-2.6.32.46/drivers/lguest/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/lguest/core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -91,9 +91,17 @@ static __init int map_switcher(void)
  	 * it's worked so far.  The end address needs +1 because __get_vm_area
  	 * allocates an extra guard page, so we need space for that.
@@ -31663,9 +31668,9 @@ diff -urNp linux-2.6.32.45/drivers/lguest/core.c linux-2.6.32.45/drivers/lguest/
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-2.6.32.45/drivers/lguest/x86/core.c linux-2.6.32.45/drivers/lguest/x86/core.c
---- linux-2.6.32.45/drivers/lguest/x86/core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/lguest/x86/core.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/lguest/x86/core.c linux-2.6.32.46/drivers/lguest/x86/core.c
+--- linux-2.6.32.46/drivers/lguest/x86/core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/lguest/x86/core.c	2011-04-17 15:56:46.000000000 -0400
 @@ -59,7 +59,7 @@ static struct {
  /* Offset from where switcher.S was compiled to where we've copied it */
  static unsigned long switcher_offset(void)
@@ -31707,9 +31712,9 @@ diff -urNp linux-2.6.32.45/drivers/lguest/x86/core.c linux-2.6.32.45/drivers/lgu
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-2.6.32.45/drivers/lguest/x86/switcher_32.S linux-2.6.32.45/drivers/lguest/x86/switcher_32.S
---- linux-2.6.32.45/drivers/lguest/x86/switcher_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/lguest/x86/switcher_32.S	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/lguest/x86/switcher_32.S linux-2.6.32.46/drivers/lguest/x86/switcher_32.S
+--- linux-2.6.32.46/drivers/lguest/x86/switcher_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/lguest/x86/switcher_32.S	2011-04-17 15:56:46.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -31768,9 +31773,9 @@ diff -urNp linux-2.6.32.45/drivers/lguest/x86/switcher_32.S linux-2.6.32.45/driv
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/macintosh/via-pmu-backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,7 @@
  
  #define MAX_PMU_LEVEL 0xFF
@@ -31789,9 +31794,9 @@ diff -urNp linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.45
  	.get_brightness	= pmu_backlight_get_brightness,
  	.update_status	= pmu_backlight_update_status,
  
-diff -urNp linux-2.6.32.45/drivers/macintosh/via-pmu.c linux-2.6.32.45/drivers/macintosh/via-pmu.c
---- linux-2.6.32.45/drivers/macintosh/via-pmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/macintosh/via-pmu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu.c linux-2.6.32.46/drivers/macintosh/via-pmu.c
+--- linux-2.6.32.46/drivers/macintosh/via-pmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/macintosh/via-pmu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
  		&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
  }
@@ -31801,9 +31806,9 @@ diff -urNp linux-2.6.32.45/drivers/macintosh/via-pmu.c linux-2.6.32.45/drivers/m
  	.enter = powerbook_sleep,
  	.valid = pmu_sleep_valid,
  };
-diff -urNp linux-2.6.32.45/drivers/md/dm.c linux-2.6.32.45/drivers/md/dm.c
---- linux-2.6.32.45/drivers/md/dm.c	2011-08-09 18:35:29.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/dm.c	2011-08-09 18:33:59.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/dm.c linux-2.6.32.46/drivers/md/dm.c
+--- linux-2.6.32.46/drivers/md/dm.c	2011-08-09 18:35:29.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm.c	2011-08-09 18:33:59.000000000 -0400
 @@ -165,9 +165,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
@@ -31858,9 +31863,9 @@ diff -urNp linux-2.6.32.45/drivers/md/dm.c linux-2.6.32.45/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-2.6.32.45/drivers/md/dm-ioctl.c linux-2.6.32.45/drivers/md/dm-ioctl.c
---- linux-2.6.32.45/drivers/md/dm-ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/dm-ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/dm-ioctl.c linux-2.6.32.46/drivers/md/dm-ioctl.c
+--- linux-2.6.32.46/drivers/md/dm-ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm-ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
@@ -31870,9 +31875,9 @@ diff -urNp linux-2.6.32.45/drivers/md/dm-ioctl.c linux-2.6.32.45/drivers/md/dm-i
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-2.6.32.45/drivers/md/dm-raid1.c linux-2.6.32.45/drivers/md/dm-raid1.c
---- linux-2.6.32.45/drivers/md/dm-raid1.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/dm-raid1.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/dm-raid1.c linux-2.6.32.46/drivers/md/dm-raid1.c
+--- linux-2.6.32.46/drivers/md/dm-raid1.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm-raid1.c	2011-05-04 17:56:28.000000000 -0400
 @@ -41,7 +41,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -31945,9 +31950,9 @@ diff -urNp linux-2.6.32.45/drivers/md/dm-raid1.c linux-2.6.32.45/drivers/md/dm-r
  		return 'A';
  
  	return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
-diff -urNp linux-2.6.32.45/drivers/md/dm-stripe.c linux-2.6.32.45/drivers/md/dm-stripe.c
---- linux-2.6.32.45/drivers/md/dm-stripe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/dm-stripe.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/dm-stripe.c linux-2.6.32.46/drivers/md/dm-stripe.c
+--- linux-2.6.32.46/drivers/md/dm-stripe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm-stripe.c	2011-05-04 17:56:28.000000000 -0400
 @@ -20,7 +20,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
@@ -31986,9 +31991,9 @@ diff -urNp linux-2.6.32.45/drivers/md/dm-stripe.c linux-2.6.32.45/drivers/md/dm-
  			    DM_IO_ERROR_THRESHOLD)
  				queue_work(kstriped, &sc->kstriped_ws);
  		}
-diff -urNp linux-2.6.32.45/drivers/md/dm-sysfs.c linux-2.6.32.45/drivers/md/dm-sysfs.c
---- linux-2.6.32.45/drivers/md/dm-sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/dm-sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/dm-sysfs.c linux-2.6.32.46/drivers/md/dm-sysfs.c
+--- linux-2.6.32.46/drivers/md/dm-sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm-sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
  	NULL,
  };
@@ -31998,9 +32003,9 @@ diff -urNp linux-2.6.32.45/drivers/md/dm-sysfs.c linux-2.6.32.45/drivers/md/dm-s
  	.show	= dm_attr_show,
  };
  
-diff -urNp linux-2.6.32.45/drivers/md/dm-table.c linux-2.6.32.45/drivers/md/dm-table.c
---- linux-2.6.32.45/drivers/md/dm-table.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/dm-table.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/dm-table.c linux-2.6.32.46/drivers/md/dm-table.c
+--- linux-2.6.32.46/drivers/md/dm-table.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm-table.c	2011-06-25 12:56:37.000000000 -0400
 @@ -376,7 +376,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
@@ -32010,9 +32015,9 @@ diff -urNp linux-2.6.32.45/drivers/md/dm-table.c linux-2.6.32.45/drivers/md/dm-t
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.32.45/drivers/md/md.c linux-2.6.32.45/drivers/md/md.c
---- linux-2.6.32.45/drivers/md/md.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/md.c	2011-07-13 17:23:18.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c
+--- linux-2.6.32.46/drivers/md/md.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/drivers/md/md.c	2011-07-13 17:23:18.000000000 -0400
 @@ -153,10 +153,10 @@ static int start_readonly;
   *  start build, activate spare
   */
@@ -32155,9 +32160,9 @@ diff -urNp linux-2.6.32.45/drivers/md/md.c linux-2.6.32.45/drivers/md/md.c
  		/* sync IO will cause sync_io to increase before the disk_stats
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
-diff -urNp linux-2.6.32.45/drivers/md/md.h linux-2.6.32.45/drivers/md/md.h
---- linux-2.6.32.45/drivers/md/md.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/md.h	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/md.h linux-2.6.32.46/drivers/md/md.h
+--- linux-2.6.32.46/drivers/md/md.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/md.h	2011-05-04 17:56:20.000000000 -0400
 @@ -94,10 +94,10 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
@@ -32180,9 +32185,9 @@ diff -urNp linux-2.6.32.45/drivers/md/md.h linux-2.6.32.45/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.32.45/drivers/md/raid10.c linux-2.6.32.45/drivers/md/raid10.c
---- linux-2.6.32.45/drivers/md/raid10.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/raid10.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/raid10.c linux-2.6.32.46/drivers/md/raid10.c
+--- linux-2.6.32.46/drivers/md/raid10.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/raid10.c	2011-05-04 17:56:28.000000000 -0400
 @@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi
  	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
  		set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -32201,9 +32206,9 @@ diff -urNp linux-2.6.32.45/drivers/md/raid10.c linux-2.6.32.45/drivers/md/raid10
  				if (sync_page_io(rdev->bdev,
  						 r10_bio->devs[sl].addr +
  						 sect + rdev->data_offset,
-diff -urNp linux-2.6.32.45/drivers/md/raid1.c linux-2.6.32.45/drivers/md/raid1.c
---- linux-2.6.32.45/drivers/md/raid1.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/raid1.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/raid1.c linux-2.6.32.46/drivers/md/raid1.c
+--- linux-2.6.32.46/drivers/md/raid1.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/raid1.c	2011-05-04 17:56:28.000000000 -0400
 @@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t *
  					if (r1_bio->bios[d]->bi_end_io != end_sync_read)
  						continue;
@@ -32222,9 +32227,9 @@ diff -urNp linux-2.6.32.45/drivers/md/raid1.c linux-2.6.32.45/drivers/md/raid1.c
  					printk(KERN_INFO
  					       "raid1:%s: read error corrected "
  					       "(%d sectors at %llu on %s)\n",
-diff -urNp linux-2.6.32.45/drivers/md/raid5.c linux-2.6.32.45/drivers/md/raid5.c
---- linux-2.6.32.45/drivers/md/raid5.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/md/raid5.c	2011-06-25 12:58:39.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/md/raid5.c linux-2.6.32.46/drivers/md/raid5.c
+--- linux-2.6.32.46/drivers/md/raid5.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/md/raid5.c	2011-06-25 12:58:39.000000000 -0400
 @@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_hea
  			bi->bi_next = NULL;
  			if ((rw & WRITE) &&
@@ -32270,9 +32275,9 @@ diff -urNp linux-2.6.32.45/drivers/md/raid5.c linux-2.6.32.45/drivers/md/raid5.c
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
-diff -urNp linux-2.6.32.45/drivers/media/common/saa7146_hlp.c linux-2.6.32.45/drivers/media/common/saa7146_hlp.c
---- linux-2.6.32.45/drivers/media/common/saa7146_hlp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/common/saa7146_hlp.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/common/saa7146_hlp.c linux-2.6.32.46/drivers/media/common/saa7146_hlp.c
+--- linux-2.6.32.46/drivers/media/common/saa7146_hlp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/common/saa7146_hlp.c	2011-05-16 21:46:57.000000000 -0400
 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
  	int x[32], y[32], w[32], h[32];
@@ -32282,9 +32287,9 @@ diff -urNp linux-2.6.32.45/drivers/media/common/saa7146_hlp.c linux-2.6.32.45/dr
  	/* clear out memory */
  	memset(&line_list[0],  0x00, sizeof(u32)*32);
  	memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-05-16 21:46:57.000000000 -0400
 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
  	u8 buf[HOST_LINK_BUF_SIZE];
  	int i;
@@ -32303,9 +32308,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-2.6
  	dprintk("%s\n", __func__);
  
  	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-05 20:33:55.000000000 -0400
 @@ -71,7 +71,7 @@ struct dvb_demux_feed {
  	union {
  		dmx_ts_cb ts;
@@ -32315,9 +32320,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h linux-2.6.32.4
  
  	struct dvb_demux *demux;
  	void *priv;
-diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-23 21:22:32.000000000 -0400
 @@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapt
  			const struct dvb_device *template, void *priv, int type)
  {
@@ -32327,9 +32332,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.45/d
  	struct device *clsdev;
  	int minor;
  	int id;
-diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_di
  struct dib0700_adapter_state {
  	int (*set_param_save) (struct dvb_frontend *,
@@ -32339,9 +32344,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.32.45/dri
  
  static int dib7070_set_param_override(struct dvb_frontend *fe,
  				      struct dvb_frontend_parameters *fep)
-diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-05-16 21:46:57.000000000 -0400
 @@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb
  
  	u8 buf[260];
@@ -32351,9 +32356,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c linux-2.6.32
  	while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
  		deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);
  
-diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c
---- linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c
+--- linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/dvb-usb/dib0700_devices.c	2011-08-05 20:33:55.000000000 -0400
 @@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, "
  
  struct dib0700_adapter_state {
@@ -32363,9 +32368,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-2.6
  
  /* Hauppauge Nova-T 500 (aka Bristol)
   *  has a LNA on GPIO0 which is enabled by setting 1 */
-diff -urNp linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h
---- linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h
+--- linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/frontends/dib3000.h	2011-08-05 20:33:55.000000000 -0400
 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
  	int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
  	int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
@@ -32375,9 +32380,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h linux-2.6.32.45
  
  #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
  extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
-diff -urNp linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c
---- linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c
+--- linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/dvb/frontends/or51211.c	2011-05-16 21:46:57.000000000 -0400
 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
  	u8 tudata[585];
  	int i;
@@ -32387,9 +32392,9 @@ diff -urNp linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c linux-2.6.32.45
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
-diff -urNp linux-2.6.32.45/drivers/media/radio/radio-cadet.c linux-2.6.32.45/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.45/drivers/media/radio/radio-cadet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/radio/radio-cadet.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/radio/radio-cadet.c linux-2.6.32.46/drivers/media/radio/radio-cadet.c
+--- linux-2.6.32.46/drivers/media/radio/radio-cadet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/radio/radio-cadet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
  	while (i < count && dev->rdsin != dev->rdsout)
  		readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -32399,9 +32404,9 @@ diff -urNp linux-2.6.32.45/drivers/media/radio/radio-cadet.c linux-2.6.32.45/dri
  		return -EFAULT;
  	return i;
  }
-diff -urNp linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c
---- linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c
+--- linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/cx18/cx18-driver.c	2011-05-16 21:46:57.000000000 -0400
 @@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl
  
  MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
@@ -32429,9 +32434,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c linux-2.6.32.4
  	if (i >= CX18_MAX_CARDS) {
  		printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
  		       "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
-diff -urNp linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c
---- linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c
+--- linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/ivtv/ivtv-driver.c	2011-05-04 17:56:28.000000000 -0400
 @@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl
  MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
  
@@ -32441,9 +32446,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c linux-2.6.32.4
  
  /* Parameter declarations */
  static int cardtype[IVTV_MAX_CARDS];
-diff -urNp linux-2.6.32.45/drivers/media/video/omap24xxcam.c linux-2.6.32.45/drivers/media/video/omap24xxcam.c
---- linux-2.6.32.45/drivers/media/video/omap24xxcam.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/omap24xxcam.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.c linux-2.6.32.46/drivers/media/video/omap24xxcam.c
+--- linux-2.6.32.46/drivers/media/video/omap24xxcam.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/omap24xxcam.c	2011-05-04 17:56:28.000000000 -0400
 @@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(str
  	spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
  
@@ -32453,9 +32458,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/omap24xxcam.c linux-2.6.32.45/dri
  	if (csr & csr_error) {
  		vb->state = VIDEOBUF_ERROR;
  		if (!atomic_read(&fh->cam->in_reset)) {
-diff -urNp linux-2.6.32.45/drivers/media/video/omap24xxcam.h linux-2.6.32.45/drivers/media/video/omap24xxcam.h
---- linux-2.6.32.45/drivers/media/video/omap24xxcam.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/omap24xxcam.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/omap24xxcam.h linux-2.6.32.46/drivers/media/video/omap24xxcam.h
+--- linux-2.6.32.46/drivers/media/video/omap24xxcam.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/omap24xxcam.h	2011-05-04 17:56:28.000000000 -0400
 @@ -533,7 +533,7 @@ struct omap24xxcam_fh {
  	spinlock_t vbq_lock; /* spinlock for the videobuf queue */
  	struct videobuf_queue vbq;
@@ -32465,9 +32470,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/omap24xxcam.h linux-2.6.32.45/dri
  	/* accessing cam here doesn't need serialisation: it's constant */
  	struct omap24xxcam_device *cam;
  };
-diff -urNp linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-05-16 21:46:57.000000000 -0400
 @@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
  	u8 *eeprom;
  	struct tveeprom tvdata;
@@ -32477,9 +32482,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-2.
  	memset(&tvdata,0,sizeof(tvdata));
  
  	eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
---- linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+--- linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	2011-08-23 21:22:38.000000000 -0400
 @@ -195,7 +195,7 @@ struct pvr2_hdw {
  
  	/* I2C stuff */
@@ -32489,9 +32494,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h li
  	pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
  	int i2c_cx25840_hack_state;
  	int i2c_linked;
-diff -urNp linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c
---- linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c
+--- linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/saa7134/saa6752hs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_su
  	unsigned char localPAT[256];
  	unsigned char localPMT[256];
@@ -32501,9 +32506,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c linux-2.6.32.
  	/* Set video format - must be done first as it resets other settings */
  	set_reg8(client, 0x41, h->video_format);
  
-diff -urNp linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/saa7164/saa7164-cmd.c	2011-05-16 21:46:57.000000000 -0400
 @@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_d
  	wait_queue_head_t *q = 0;
  	dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -32522,9 +32527,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c linux-2.6.3
  	while (loop) {
  
  		tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c
---- linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c
+--- linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvideo/ibmcam.c	2011-08-05 20:33:55.000000000 -0400
 @@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] =
  static int __init ibmcam_init(void)
  {
@@ -32550,9 +32555,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c linux-2.6.32.45
  	return usbvideo_register(
  		&cams,
  		MAX_IBMCAM,
-diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c
+--- linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvideo/konicawc.c	2011-08-05 20:33:55.000000000 -0400
 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru
  	int error;
  
@@ -32589,9 +32594,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
  	return usbvideo_register(
  		&cams,
  		MAX_CAMERAS,
-diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c
+--- linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvideo/quickcam_messenger.c	2011-04-17 15:56:46.000000000 -0400
 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
  	int error;
  
@@ -32601,9 +32606,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c lin
  
  	cam->input = input_dev = input_allocate_device();
  	if (!input_dev) {
-diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c
---- linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c
+--- linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvideo/ultracam.c	2011-08-05 20:33:55.000000000 -0400
 @@ -655,14 +655,14 @@ static int __init ultracam_init(void)
  {
  	struct usbvideo_cb cbTbl;
@@ -32627,9 +32632,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c linux-2.6.32.
  	return usbvideo_register(
  		&cams,
  		MAX_CAMERAS,
-diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c
---- linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c
+--- linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.c	2011-08-05 20:33:55.000000000 -0400
 @@ -697,15 +697,15 @@ int usbvideo_register(
  	    __func__, cams, base_size, num_cams);
  
@@ -32651,9 +32656,21 @@ diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c linux-2.6.32.
  
  	cams->num_cameras = num_cams;
  	cams->cam = (struct uvd *) &cams[1];
-diff -urNp linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c
---- linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h
+--- linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvideo/usbvideo.h	2011-08-30 18:20:06.000000000 -0400
+@@ -268,7 +268,7 @@ struct usbvideo_cb {
+ 	int (*startDataPump)(struct uvd *uvd);
+ 	void (*stopDataPump)(struct uvd *uvd);
+ 	int (*setVideoMode)(struct uvd *uvd, struct video_window *vw);
+-};
++} __no_const;
+ 
+ struct usbvideo {
+ 	int num_cameras;		/* As allocated */
+diff -urNp linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c
+--- linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/usbvision/usbvision-core.c	2011-05-16 21:46:57.000000000 -0400
 @@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_c
  	unsigned char rv, gv, bv;
  	static unsigned char *Y, *U, *V;
@@ -32663,9 +32680,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c linux-
  	frame  = usbvision->curFrame;
  	imageSize = frame->frmwidth * frame->frmheight;
  	if ( (frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-2.6.32.45/drivers/media/video/v4l2-device.c linux-2.6.32.45/drivers/media/video/v4l2-device.c
---- linux-2.6.32.45/drivers/media/video/v4l2-device.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/v4l2-device.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/v4l2-device.c linux-2.6.32.46/drivers/media/video/v4l2-device.c
+--- linux-2.6.32.46/drivers/media/video/v4l2-device.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/v4l2-device.c	2011-05-04 17:56:28.000000000 -0400
 @@ -50,9 +50,9 @@ int v4l2_device_register(struct device *
  EXPORT_SYMBOL_GPL(v4l2_device_register);
  
@@ -32678,9 +32695,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/v4l2-device.c linux-2.6.32.45/dri
  	int len = strlen(basename);
  
  	if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff -urNp linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c
---- linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c
+--- linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/media/video/videobuf-dma-sg.c	2011-05-16 21:46:57.000000000 -0400
 @@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size)
  {
  	struct videobuf_queue q;
@@ -32690,9 +32707,9 @@ diff -urNp linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c linux-2.6.32.45
  	/* Required to make generic handler to call __videobuf_alloc */
  	q.int_ops = &sg_ops;
  
-diff -urNp linux-2.6.32.45/drivers/message/fusion/mptbase.c linux-2.6.32.45/drivers/message/fusion/mptbase.c
---- linux-2.6.32.45/drivers/message/fusion/mptbase.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/message/fusion/mptbase.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/message/fusion/mptbase.c linux-2.6.32.46/drivers/message/fusion/mptbase.c
+--- linux-2.6.32.46/drivers/message/fusion/mptbase.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/message/fusion/mptbase.c	2011-04-17 15:56:46.000000000 -0400
 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s
  	len += sprintf(buf+len, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
  	len += sprintf(buf+len, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -32708,9 +32725,9 @@ diff -urNp linux-2.6.32.45/drivers/message/fusion/mptbase.c linux-2.6.32.45/driv
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-2.6.32.45/drivers/message/fusion/mptsas.c linux-2.6.32.45/drivers/message/fusion/mptsas.c
---- linux-2.6.32.45/drivers/message/fusion/mptsas.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/message/fusion/mptsas.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/message/fusion/mptsas.c linux-2.6.32.46/drivers/message/fusion/mptsas.c
+--- linux-2.6.32.46/drivers/message/fusion/mptsas.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/message/fusion/mptsas.c	2011-04-17 15:56:46.000000000 -0400
 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
@@ -32759,9 +32776,9 @@ diff -urNp linux-2.6.32.45/drivers/message/fusion/mptsas.c linux-2.6.32.45/drive
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-2.6.32.45/drivers/message/fusion/mptscsih.c linux-2.6.32.45/drivers/message/fusion/mptscsih.c
---- linux-2.6.32.45/drivers/message/fusion/mptscsih.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/message/fusion/mptscsih.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/message/fusion/mptscsih.c linux-2.6.32.46/drivers/message/fusion/mptscsih.c
+--- linux-2.6.32.46/drivers/message/fusion/mptscsih.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/message/fusion/mptscsih.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -32787,9 +32804,9 @@ diff -urNp linux-2.6.32.45/drivers/message/fusion/mptscsih.c linux-2.6.32.45/dri
  
  	return h->info_kbuf;
  }
-diff -urNp linux-2.6.32.45/drivers/message/i2o/i2o_config.c linux-2.6.32.45/drivers/message/i2o/i2o_config.c
---- linux-2.6.32.45/drivers/message/i2o/i2o_config.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/message/i2o/i2o_config.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_config.c linux-2.6.32.46/drivers/message/i2o/i2o_config.c
+--- linux-2.6.32.46/drivers/message/i2o/i2o_config.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/message/i2o/i2o_config.c	2011-05-16 21:46:57.000000000 -0400
 @@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned lon
  	struct i2o_message *msg;
  	unsigned int iop;
@@ -32799,9 +32816,9 @@ diff -urNp linux-2.6.32.45/drivers/message/i2o/i2o_config.c linux-2.6.32.45/driv
  	if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.45/drivers/message/i2o/i2o_proc.c linux-2.6.32.45/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.45/drivers/message/i2o/i2o_proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/message/i2o/i2o_proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/message/i2o/i2o_proc.c linux-2.6.32.46/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.32.46/drivers/message/i2o/i2o_proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/message/i2o/i2o_proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -259,13 +259,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -32888,9 +32905,9 @@ diff -urNp linux-2.6.32.45/drivers/message/i2o/i2o_proc.c linux-2.6.32.45/driver
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/drivers/message/i2o/iop.c linux-2.6.32.45/drivers/message/i2o/iop.c
---- linux-2.6.32.45/drivers/message/i2o/iop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/message/i2o/iop.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/message/i2o/iop.c linux-2.6.32.46/drivers/message/i2o/iop.c
+--- linux-2.6.32.46/drivers/message/i2o/iop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/message/i2o/iop.c	2011-05-04 17:56:28.000000000 -0400
 @@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
  	spin_lock_irqsave(&c->context_list_lock, flags);
@@ -32914,9 +32931,9 @@ diff -urNp linux-2.6.32.45/drivers/message/i2o/iop.c linux-2.6.32.45/drivers/mes
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-2.6.32.45/drivers/mfd/wm8350-i2c.c linux-2.6.32.45/drivers/mfd/wm8350-i2c.c
---- linux-2.6.32.45/drivers/mfd/wm8350-i2c.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mfd/wm8350-i2c.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mfd/wm8350-i2c.c linux-2.6.32.46/drivers/mfd/wm8350-i2c.c
+--- linux-2.6.32.46/drivers/mfd/wm8350-i2c.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mfd/wm8350-i2c.c	2011-05-16 21:46:57.000000000 -0400
 @@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struc
  	u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
  	int ret;
@@ -32926,9 +32943,9 @@ diff -urNp linux-2.6.32.45/drivers/mfd/wm8350-i2c.c linux-2.6.32.45/drivers/mfd/
  	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.45/drivers/misc/kgdbts.c linux-2.6.32.45/drivers/misc/kgdbts.c
---- linux-2.6.32.45/drivers/misc/kgdbts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/kgdbts.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/kgdbts.c linux-2.6.32.46/drivers/misc/kgdbts.c
+--- linux-2.6.32.46/drivers/misc/kgdbts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/kgdbts.c	2011-04-17 15:56:46.000000000 -0400
 @@ -118,7 +118,7 @@
  	} while (0)
  #define MAX_CONFIG_LEN		40
@@ -32947,9 +32964,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/kgdbts.c linux-2.6.32.45/drivers/misc/kg
  	.name			= "kgdbts",
  	.read_char		= kgdbts_get_char,
  	.write_char		= kgdbts_put_char,
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-gru/gruhandles.c	2011-04-17 15:56:46.000000000 -0400
 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
  
  static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -32961,9 +32978,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.45/dri
  	if (mcs_op_statistics[op].max < clks)
  		mcs_op_statistics[op].max = clks;
  }
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-gru/gruprocfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -32987,9 +33004,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.45/driv
  		max = mcs_op_statistics[op].max;
  		seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
  			   count ? total / count : 0, max);
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h	2011-04-17 15:56:46.000000000 -0400
 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -33173,9 +33190,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h linux-2.6.32.45/driv
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h
---- linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h
+--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h	2011-08-05 20:33:55.000000000 -0400
 @@ -876,7 +876,7 @@ extern struct xpc_registration xpc_regis
  /* found in xpc_main.c */
  extern struct device *xpc_part;
@@ -33185,9 +33202,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h linux-2.6.32.45/drivers/mis
  extern int xpc_disengage_timelimit;
  extern int xpc_disengage_timedout;
  extern int xpc_activate_IRQ_rcvd;
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c
---- linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c
+--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_main.c	2011-08-05 20:33:55.000000000 -0400
 @@ -169,7 +169,7 @@ static struct notifier_block xpc_die_not
  	.notifier_call = xpc_system_die,
  };
@@ -33197,9 +33214,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.45/driver
  
  /*
   * Timer function to enforce the timelimit on the partition disengage.
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c
---- linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c
+--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_sn2.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_chan
  		xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
  }
@@ -33220,9 +33237,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.45/drivers
  
  	if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) {
  		dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c
---- linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c
+--- linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_chann
  		XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
  }
@@ -33243,9 +33260,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.45/drivers/
  
  	if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
  		dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
-diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xp.h linux-2.6.32.45/drivers/misc/sgi-xp/xp.h
---- linux-2.6.32.45/drivers/misc/sgi-xp/xp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/misc/sgi-xp/xp.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xp.h linux-2.6.32.46/drivers/misc/sgi-xp/xp.h
+--- linux-2.6.32.46/drivers/misc/sgi-xp/xp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-xp/xp.h	2011-08-05 20:33:55.000000000 -0400
 @@ -289,7 +289,7 @@ struct xpc_interface {
  					xpc_notify_func, void *);
  	void (*received) (short, int, void *);
@@ -33255,9 +33272,9 @@ diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xp.h linux-2.6.32.45/drivers/misc
  
  extern struct xpc_interface xpc_interface;
  
-diff -urNp linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-16 21:46:57.000000000 -0400
 @@ -743,6 +743,8 @@ static int chip_ready (struct map_info *
  	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  	unsigned long timeo = jiffies + HZ;
@@ -33285,9 +33302,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.45/d
  	adr += chip->start;
  
   retry:
-diff -urNp linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0020.c	2011-05-16 21:46:57.000000000 -0400
 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
  	unsigned long cmd_addr;
  	struct cfi_private *cfi = map->fldrv_priv;
@@ -33333,9 +33350,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6.32.45/d
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-diff -urNp linux-2.6.32.45/drivers/mtd/devices/doc2000.c linux-2.6.32.45/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.45/drivers/mtd/devices/doc2000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/devices/doc2000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2000.c linux-2.6.32.46/drivers/mtd/devices/doc2000.c
+--- linux-2.6.32.46/drivers/mtd/devices/doc2000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/devices/doc2000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
@@ -33345,9 +33362,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/devices/doc2000.c linux-2.6.32.45/drivers
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-2.6.32.45/drivers/mtd/devices/doc2001.c linux-2.6.32.45/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.45/drivers/mtd/devices/doc2001.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/devices/doc2001.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/devices/doc2001.c linux-2.6.32.46/drivers/mtd/devices/doc2001.c
+--- linux-2.6.32.46/drivers/mtd/devices/doc2001.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/devices/doc2001.c	2011-04-17 15:56:46.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -33357,9 +33374,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/devices/doc2001.c linux-2.6.32.45/drivers
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.32.45/drivers/mtd/ftl.c linux-2.6.32.45/drivers/mtd/ftl.c
---- linux-2.6.32.45/drivers/mtd/ftl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/ftl.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/ftl.c linux-2.6.32.46/drivers/mtd/ftl.c
+--- linux-2.6.32.46/drivers/mtd/ftl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/ftl.c	2011-05-16 21:46:57.000000000 -0400
 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -33369,9 +33386,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/ftl.c linux-2.6.32.45/drivers/mtd/ftl.c
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-2.6.32.45/drivers/mtd/inftlcore.c linux-2.6.32.45/drivers/mtd/inftlcore.c
---- linux-2.6.32.45/drivers/mtd/inftlcore.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/inftlcore.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/inftlcore.c linux-2.6.32.46/drivers/mtd/inftlcore.c
+--- linux-2.6.32.46/drivers/mtd/inftlcore.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/inftlcore.c	2011-05-16 21:46:57.000000000 -0400
 @@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLr
  	struct inftl_oob oob;
  	size_t retlen;
@@ -33381,9 +33398,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/inftlcore.c linux-2.6.32.45/drivers/mtd/i
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
  		"pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff -urNp linux-2.6.32.45/drivers/mtd/inftlmount.c linux-2.6.32.45/drivers/mtd/inftlmount.c
---- linux-2.6.32.45/drivers/mtd/inftlmount.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/inftlmount.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/inftlmount.c linux-2.6.32.46/drivers/mtd/inftlmount.c
+--- linux-2.6.32.46/drivers/mtd/inftlmount.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/inftlmount.c	2011-05-16 21:46:57.000000000 -0400
 @@ -54,6 +54,8 @@ static int find_boot_record(struct INFTL
  	struct INFTLPartition *ip;
  	size_t retlen;
@@ -33393,9 +33410,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/inftlmount.c linux-2.6.32.45/drivers/mtd/
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c
---- linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/lpddr/qinfo_probe.c	2011-05-16 21:46:57.000000000 -0400
 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
  	map_word pfow_val[4];
@@ -33405,9 +33422,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.45/drive
  	/* Check identification string */
  	pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
  	pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
-diff -urNp linux-2.6.32.45/drivers/mtd/mtdchar.c linux-2.6.32.45/drivers/mtd/mtdchar.c
---- linux-2.6.32.45/drivers/mtd/mtdchar.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/mtdchar.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/mtdchar.c linux-2.6.32.46/drivers/mtd/mtdchar.c
+--- linux-2.6.32.46/drivers/mtd/mtdchar.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/mtdchar.c	2011-05-16 21:46:57.000000000 -0400
 @@ -460,6 +460,8 @@ static int mtd_ioctl(struct inode *inode
  	u_long size;
  	struct mtd_info_user info;
@@ -33417,9 +33434,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/mtdchar.c linux-2.6.32.45/drivers/mtd/mtd
  	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
  	size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-2.6.32.45/drivers/mtd/nftlcore.c linux-2.6.32.45/drivers/mtd/nftlcore.c
---- linux-2.6.32.45/drivers/mtd/nftlcore.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/nftlcore.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/nftlcore.c linux-2.6.32.46/drivers/mtd/nftlcore.c
+--- linux-2.6.32.46/drivers/mtd/nftlcore.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/nftlcore.c	2011-05-16 21:46:57.000000000 -0400
 @@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLre
  	int inplace = 1;
  	size_t retlen;
@@ -33429,9 +33446,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/nftlcore.c linux-2.6.32.45/drivers/mtd/nf
  	memset(BlockMap, 0xff, sizeof(BlockMap));
  	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-2.6.32.45/drivers/mtd/nftlmount.c linux-2.6.32.45/drivers/mtd/nftlmount.c
---- linux-2.6.32.45/drivers/mtd/nftlmount.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/nftlmount.c	2011-05-18 20:09:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/nftlmount.c linux-2.6.32.46/drivers/mtd/nftlmount.c
+--- linux-2.6.32.46/drivers/mtd/nftlmount.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/nftlmount.c	2011-05-18 20:09:37.000000000 -0400
 @@ -23,6 +23,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -33449,9 +33466,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/nftlmount.c linux-2.6.32.45/drivers/mtd/n
          /* Assume logical EraseSize == physical erasesize for starting the scan.
  	   We'll sort it out later if we find a MediaHeader which says otherwise */
  	/* Actually, we won't.  The new DiskOnChip driver has already scanned
-diff -urNp linux-2.6.32.45/drivers/mtd/ubi/build.c linux-2.6.32.45/drivers/mtd/ubi/build.c
---- linux-2.6.32.45/drivers/mtd/ubi/build.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/mtd/ubi/build.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/mtd/ubi/build.c linux-2.6.32.46/drivers/mtd/ubi/build.c
+--- linux-2.6.32.46/drivers/mtd/ubi/build.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/mtd/ubi/build.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
@@ -33491,9 +33508,9 @@ diff -urNp linux-2.6.32.45/drivers/mtd/ubi/build.c linux-2.6.32.45/drivers/mtd/u
  }
  
  /**
-diff -urNp linux-2.6.32.45/drivers/net/bnx2.c linux-2.6.32.45/drivers/net/bnx2.c
---- linux-2.6.32.45/drivers/net/bnx2.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/bnx2.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/bnx2.c linux-2.6.32.46/drivers/net/bnx2.c
+--- linux-2.6.32.46/drivers/net/bnx2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/bnx2.c	2011-05-16 21:46:57.000000000 -0400
 @@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp)
  	int rc = 0;
  	u32 magic, csum;
@@ -33503,9 +33520,9 @@ diff -urNp linux-2.6.32.45/drivers/net/bnx2.c linux-2.6.32.45/drivers/net/bnx2.c
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
-diff -urNp linux-2.6.32.45/drivers/net/cxgb3/l2t.h linux-2.6.32.45/drivers/net/cxgb3/l2t.h
---- linux-2.6.32.45/drivers/net/cxgb3/l2t.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/cxgb3/l2t.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/cxgb3/l2t.h linux-2.6.32.46/drivers/net/cxgb3/l2t.h
+--- linux-2.6.32.46/drivers/net/cxgb3/l2t.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/cxgb3/l2t.h	2011-08-05 20:33:55.000000000 -0400
 @@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
   */
  struct l2t_skb_cb {
@@ -33515,9 +33532,9 @@ diff -urNp linux-2.6.32.45/drivers/net/cxgb3/l2t.h linux-2.6.32.45/drivers/net/c
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
-diff -urNp linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c
---- linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c
+--- linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/cxgb3/t3_hw.c	2011-05-16 21:46:57.000000000 -0400
 @@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter
  	int i, addr, ret;
  	struct t3_vpd vpd;
@@ -33527,9 +33544,9 @@ diff -urNp linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c linux-2.6.32.45/drivers/net
  	/*
  	 * Card information is normally at VPD_BASE but some early cards had
  	 * it at 0.
-diff -urNp linux-2.6.32.45/drivers/net/e1000e/82571.c linux-2.6.32.45/drivers/net/e1000e/82571.c
---- linux-2.6.32.45/drivers/net/e1000e/82571.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/e1000e/82571.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/e1000e/82571.c linux-2.6.32.46/drivers/net/e1000e/82571.c
+--- linux-2.6.32.46/drivers/net/e1000e/82571.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/e1000e/82571.c	2011-08-23 21:22:32.000000000 -0400
 @@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -33584,9 +33601,9 @@ diff -urNp linux-2.6.32.45/drivers/net/e1000e/82571.c linux-2.6.32.45/drivers/ne
  	.acquire_nvm		= e1000_acquire_nvm_82571,
  	.read_nvm		= e1000e_read_nvm_eerd,
  	.release_nvm		= e1000_release_nvm_82571,
-diff -urNp linux-2.6.32.45/drivers/net/e1000e/e1000.h linux-2.6.32.45/drivers/net/e1000e/e1000.h
---- linux-2.6.32.45/drivers/net/e1000e/e1000.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/e1000e/e1000.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/e1000e/e1000.h linux-2.6.32.46/drivers/net/e1000e/e1000.h
+--- linux-2.6.32.46/drivers/net/e1000e/e1000.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/e1000e/e1000.h	2011-04-17 15:56:46.000000000 -0400
 @@ -375,9 +375,9 @@ struct e1000_info {
  	u32			pba;
  	u32			max_hw_frame_size;
@@ -33600,9 +33617,9 @@ diff -urNp linux-2.6.32.45/drivers/net/e1000e/e1000.h linux-2.6.32.45/drivers/ne
  };
  
  /* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.32.45/drivers/net/e1000e/es2lan.c linux-2.6.32.45/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.45/drivers/net/e1000e/es2lan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/e1000e/es2lan.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/e1000e/es2lan.c linux-2.6.32.46/drivers/net/e1000e/es2lan.c
+--- linux-2.6.32.46/drivers/net/e1000e/es2lan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/e1000e/es2lan.c	2011-08-23 21:22:32.000000000 -0400
 @@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -33639,9 +33656,9 @@ diff -urNp linux-2.6.32.45/drivers/net/e1000e/es2lan.c linux-2.6.32.45/drivers/n
  	.acquire_nvm		= e1000_acquire_nvm_80003es2lan,
  	.read_nvm		= e1000e_read_nvm_eerd,
  	.release_nvm		= e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.32.45/drivers/net/e1000e/hw.h linux-2.6.32.45/drivers/net/e1000e/hw.h
---- linux-2.6.32.45/drivers/net/e1000e/hw.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/e1000e/hw.h	2011-08-23 21:27:38.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/e1000e/hw.h linux-2.6.32.46/drivers/net/e1000e/hw.h
+--- linux-2.6.32.46/drivers/net/e1000e/hw.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/e1000e/hw.h	2011-08-23 21:27:38.000000000 -0400
 @@ -753,6 +753,7 @@ struct e1000_mac_operations {
  	s32  (*setup_physical_interface)(struct e1000_hw *);
  	s32  (*setup_led)(struct e1000_hw *);
@@ -33688,9 +33705,9 @@ diff -urNp linux-2.6.32.45/drivers/net/e1000e/hw.h linux-2.6.32.45/drivers/net/e
  
  	enum e1000_nvm_type type;
  	enum e1000_nvm_override override;
-diff -urNp linux-2.6.32.45/drivers/net/e1000e/ich8lan.c linux-2.6.32.45/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.45/drivers/net/e1000e/ich8lan.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/e1000e/ich8lan.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/e1000e/ich8lan.c linux-2.6.32.46/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.32.46/drivers/net/e1000e/ich8lan.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/net/e1000e/ich8lan.c	2011-08-23 21:22:32.000000000 -0400
 @@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan
  	}
  }
@@ -33718,9 +33735,9 @@ diff -urNp linux-2.6.32.45/drivers/net/e1000e/ich8lan.c linux-2.6.32.45/drivers/
  	.acquire_nvm		= e1000_acquire_nvm_ich8lan,
  	.read_nvm	 	= e1000_read_nvm_ich8lan,
  	.release_nvm		= e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.32.45/drivers/net/hamradio/6pack.c linux-2.6.32.45/drivers/net/hamradio/6pack.c
---- linux-2.6.32.45/drivers/net/hamradio/6pack.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/hamradio/6pack.c	2011-07-13 17:23:18.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/hamradio/6pack.c linux-2.6.32.46/drivers/net/hamradio/6pack.c
+--- linux-2.6.32.46/drivers/net/hamradio/6pack.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/drivers/net/hamradio/6pack.c	2011-07-13 17:23:18.000000000 -0400
 @@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct t
  	unsigned char buf[512];
  	int count1;
@@ -33730,9 +33747,9 @@ diff -urNp linux-2.6.32.45/drivers/net/hamradio/6pack.c linux-2.6.32.45/drivers/
  	if (!count)
  		return;
  
-diff -urNp linux-2.6.32.45/drivers/net/ibmveth.c linux-2.6.32.45/drivers/net/ibmveth.c
---- linux-2.6.32.45/drivers/net/ibmveth.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/ibmveth.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/ibmveth.c linux-2.6.32.46/drivers/net/ibmveth.c
+--- linux-2.6.32.46/drivers/net/ibmveth.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/ibmveth.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
  	NULL,
  };
@@ -33742,10 +33759,10 @@ diff -urNp linux-2.6.32.45/drivers/net/ibmveth.c linux-2.6.32.45/drivers/net/ibm
  	.show   = veth_pool_show,
  	.store  = veth_pool_store,
  };
-diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_82575.c linux-2.6.32.45/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.45/drivers/net/igb/e1000_82575.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/igb/e1000_82575.c	2011-08-23 21:22:32.000000000 -0400
-@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct 
+diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_82575.c linux-2.6.32.46/drivers/net/igb/e1000_82575.c
+--- linux-2.6.32.46/drivers/net/igb/e1000_82575.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/drivers/net/igb/e1000_82575.c	2011-08-29 22:25:07.000000000 -0400
+@@ -1411,7 +1411,7 @@ void igb_vmdq_set_replication_pf(struct 
  	wr32(E1000_VT_CTL, vt_ctl);
  }
  
@@ -33754,7 +33771,7 @@ diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_82575.c linux-2.6.32.45/drivers
  	.reset_hw             = igb_reset_hw_82575,
  	.init_hw              = igb_init_hw_82575,
  	.check_for_link       = igb_check_for_link_82575,
-@@ -1419,13 +1419,13 @@ static struct e1000_mac_operations e1000
+@@ -1420,13 +1420,13 @@ static struct e1000_mac_operations e1000
  	.get_speed_and_duplex = igb_get_speed_and_duplex_copper,
  };
  
@@ -33770,9 +33787,9 @@ diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_82575.c linux-2.6.32.45/drivers
  	.acquire              = igb_acquire_nvm_82575,
  	.read                 = igb_read_nvm_eerd,
  	.release              = igb_release_nvm_82575,
-diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_hw.h linux-2.6.32.45/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.45/drivers/net/igb/e1000_hw.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/igb/e1000_hw.h	2011-08-23 21:28:01.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/igb/e1000_hw.h linux-2.6.32.46/drivers/net/igb/e1000_hw.h
+--- linux-2.6.32.46/drivers/net/igb/e1000_hw.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/igb/e1000_hw.h	2011-08-23 21:28:01.000000000 -0400
 @@ -288,6 +288,7 @@ struct e1000_mac_operations {
  	s32  (*read_mac_addr)(struct e1000_hw *);
  	s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
@@ -33841,9 +33858,9 @@ diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_hw.h linux-2.6.32.45/drivers/ne
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-2.6.32.45/drivers/net/igbvf/vf.h linux-2.6.32.45/drivers/net/igbvf/vf.h
---- linux-2.6.32.45/drivers/net/igbvf/vf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/igbvf/vf.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/igbvf/vf.h linux-2.6.32.46/drivers/net/igbvf/vf.h
+--- linux-2.6.32.46/drivers/net/igbvf/vf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/igbvf/vf.h	2011-08-23 21:22:38.000000000 -0400
 @@ -187,9 +187,10 @@ struct e1000_mac_operations {
  	s32  (*read_mac_addr)(struct e1000_hw *);
  	s32  (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -33873,9 +33890,9 @@ diff -urNp linux-2.6.32.45/drivers/net/igbvf/vf.h linux-2.6.32.45/drivers/net/ig
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-2.6.32.45/drivers/net/iseries_veth.c linux-2.6.32.45/drivers/net/iseries_veth.c
---- linux-2.6.32.45/drivers/net/iseries_veth.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/iseries_veth.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/iseries_veth.c linux-2.6.32.46/drivers/net/iseries_veth.c
+--- linux-2.6.32.46/drivers/net/iseries_veth.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/iseries_veth.c	2011-04-17 15:56:46.000000000 -0400
 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
  	NULL
  };
@@ -33894,9 +33911,9 @@ diff -urNp linux-2.6.32.45/drivers/net/iseries_veth.c linux-2.6.32.45/drivers/ne
  	.show = veth_port_attribute_show
  };
  
-diff -urNp linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c
---- linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c
+--- linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/ixgb/ixgb_main.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev
  	u32 rctl;
  	int i;
@@ -33906,9 +33923,9 @@ diff -urNp linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c linux-2.6.32.45/drivers/
  	/* Check for Promiscuous and All Multicast modes */
  
  	rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c
---- linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c
+--- linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/ixgb/ixgb_param.c	2011-05-16 21:46:57.000000000 -0400
 @@ -260,6 +260,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -33919,9 +33936,9 @@ diff -urNp linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c linux-2.6.32.45/drivers
  	if (bd >= IXGB_MAX_NIC) {
  		printk(KERN_NOTICE
  			   "Warning: no configuration for board #%i\n", bd);
-diff -urNp linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h
---- linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h
+--- linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/ixgbe/ixgbe_type.h	2011-08-23 21:22:38.000000000 -0400
 @@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations {
  	s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
  	s32 (*update_checksum)(struct ixgbe_hw *);
@@ -33968,9 +33985,9 @@ diff -urNp linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.45/driver
  	struct mdio_if_info		mdio;
  	enum ixgbe_phy_type             type;
  	u32                             id;
-diff -urNp linux-2.6.32.45/drivers/net/mlx4/main.c linux-2.6.32.45/drivers/net/mlx4/main.c
---- linux-2.6.32.45/drivers/net/mlx4/main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/mlx4/main.c	2011-05-18 20:09:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/mlx4/main.c linux-2.6.32.46/drivers/net/mlx4/main.c
+--- linux-2.6.32.46/drivers/net/mlx4/main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/mlx4/main.c	2011-05-18 20:09:37.000000000 -0400
 @@ -38,6 +38,7 @@
  #include <linux/errno.h>
  #include <linux/pci.h>
@@ -33988,9 +34005,9 @@ diff -urNp linux-2.6.32.45/drivers/net/mlx4/main.c linux-2.6.32.45/drivers/net/m
  	err = mlx4_QUERY_FW(dev);
  	if (err) {
  		if (err == -EACCES)
-diff -urNp linux-2.6.32.45/drivers/net/niu.c linux-2.6.32.45/drivers/net/niu.c
---- linux-2.6.32.45/drivers/net/niu.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/niu.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/niu.c linux-2.6.32.46/drivers/net/niu.c
+--- linux-2.6.32.46/drivers/net/niu.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/net/niu.c	2011-05-16 21:46:57.000000000 -0400
 @@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struc
  	int i, num_irqs, err;
  	u8 first_ldg;
@@ -34000,9 +34017,9 @@ diff -urNp linux-2.6.32.45/drivers/net/niu.c linux-2.6.32.45/drivers/net/niu.c
  	first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
  	for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
  		ldg_num_map[i] = first_ldg + i;
-diff -urNp linux-2.6.32.45/drivers/net/pcnet32.c linux-2.6.32.45/drivers/net/pcnet32.c
---- linux-2.6.32.45/drivers/net/pcnet32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/pcnet32.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/pcnet32.c linux-2.6.32.46/drivers/net/pcnet32.c
+--- linux-2.6.32.46/drivers/net/pcnet32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/pcnet32.c	2011-08-05 20:33:55.000000000 -0400
 @@ -79,7 +79,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -34639,9 +34656,9 @@ diff -urNp linux-2.6.32.45/drivers/net/pcnet32.c linux-2.6.32.45/drivers/net/pcn
  			}
  		} else {
  			if (netif_msg_link(lp))
-diff -urNp linux-2.6.32.45/drivers/net/tg3.h linux-2.6.32.45/drivers/net/tg3.h
---- linux-2.6.32.45/drivers/net/tg3.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tg3.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tg3.h linux-2.6.32.46/drivers/net/tg3.h
+--- linux-2.6.32.46/drivers/net/tg3.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tg3.h	2011-04-17 15:56:46.000000000 -0400
 @@ -95,6 +95,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
@@ -34650,9 +34667,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tg3.h linux-2.6.32.45/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff -urNp linux-2.6.32.45/drivers/net/tokenring/abyss.c linux-2.6.32.45/drivers/net/tokenring/abyss.c
---- linux-2.6.32.45/drivers/net/tokenring/abyss.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tokenring/abyss.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tokenring/abyss.c linux-2.6.32.46/drivers/net/tokenring/abyss.c
+--- linux-2.6.32.46/drivers/net/tokenring/abyss.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tokenring/abyss.c	2011-08-05 20:33:55.000000000 -0400
 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
  
  static int __init abyss_init (void)
@@ -34669,9 +34686,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tokenring/abyss.c linux-2.6.32.45/drivers
  
  	return pci_register_driver(&abyss_driver);
  }
-diff -urNp linux-2.6.32.45/drivers/net/tokenring/madgemc.c linux-2.6.32.45/drivers/net/tokenring/madgemc.c
---- linux-2.6.32.45/drivers/net/tokenring/madgemc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tokenring/madgemc.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tokenring/madgemc.c linux-2.6.32.46/drivers/net/tokenring/madgemc.c
+--- linux-2.6.32.46/drivers/net/tokenring/madgemc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tokenring/madgemc.c	2011-08-05 20:33:55.000000000 -0400
 @@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver 
  
  static int __init madgemc_init (void)
@@ -34687,9 +34704,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tokenring/madgemc.c linux-2.6.32.45/drive
  
  	return mca_register_driver (&madgemc_driver);
  }
-diff -urNp linux-2.6.32.45/drivers/net/tokenring/proteon.c linux-2.6.32.45/drivers/net/tokenring/proteon.c
---- linux-2.6.32.45/drivers/net/tokenring/proteon.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tokenring/proteon.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tokenring/proteon.c linux-2.6.32.46/drivers/net/tokenring/proteon.c
+--- linux-2.6.32.46/drivers/net/tokenring/proteon.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tokenring/proteon.c	2011-08-05 20:33:55.000000000 -0400
 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
  	struct platform_device *pdev;
  	int i, num = 0, err = 0;
@@ -34705,9 +34722,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tokenring/proteon.c linux-2.6.32.45/drive
  
  	err = platform_driver_register(&proteon_driver);
  	if (err)
-diff -urNp linux-2.6.32.45/drivers/net/tokenring/skisa.c linux-2.6.32.45/drivers/net/tokenring/skisa.c
---- linux-2.6.32.45/drivers/net/tokenring/skisa.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tokenring/skisa.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tokenring/skisa.c linux-2.6.32.46/drivers/net/tokenring/skisa.c
+--- linux-2.6.32.46/drivers/net/tokenring/skisa.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tokenring/skisa.c	2011-08-05 20:33:55.000000000 -0400
 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
  	struct platform_device *pdev;
  	int i, num = 0, err = 0;
@@ -34723,9 +34740,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tokenring/skisa.c linux-2.6.32.45/drivers
  
  	err = platform_driver_register(&sk_isa_driver);
  	if (err)
-diff -urNp linux-2.6.32.45/drivers/net/tulip/de2104x.c linux-2.6.32.45/drivers/net/tulip/de2104x.c
---- linux-2.6.32.45/drivers/net/tulip/de2104x.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tulip/de2104x.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tulip/de2104x.c linux-2.6.32.46/drivers/net/tulip/de2104x.c
+--- linux-2.6.32.46/drivers/net/tulip/de2104x.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tulip/de2104x.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_i
  	struct de_srom_info_leaf *il;
  	void *bufp;
@@ -34735,9 +34752,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tulip/de2104x.c linux-2.6.32.45/drivers/n
  	/* download entire eeprom */
  	for (i = 0; i < DE_EEPROM_WORDS; i++)
  		((__le16 *)ee_data)[i] =
-diff -urNp linux-2.6.32.45/drivers/net/tulip/de4x5.c linux-2.6.32.45/drivers/net/tulip/de4x5.c
---- linux-2.6.32.45/drivers/net/tulip/de4x5.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/tulip/de4x5.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/tulip/de4x5.c linux-2.6.32.46/drivers/net/tulip/de4x5.c
+--- linux-2.6.32.46/drivers/net/tulip/de4x5.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/tulip/de4x5.c	2011-04-17 15:56:46.000000000 -0400
 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
@@ -34756,9 +34773,9 @@ diff -urNp linux-2.6.32.45/drivers/net/tulip/de4x5.c linux-2.6.32.45/drivers/net
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-2.6.32.45/drivers/net/usb/hso.c linux-2.6.32.45/drivers/net/usb/hso.c
---- linux-2.6.32.45/drivers/net/usb/hso.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/usb/hso.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/usb/hso.c linux-2.6.32.46/drivers/net/usb/hso.c
+--- linux-2.6.32.46/drivers/net/usb/hso.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/usb/hso.c	2011-04-17 15:56:46.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -34846,9 +34863,9 @@ diff -urNp linux-2.6.32.45/drivers/net/usb/hso.c linux-2.6.32.45/drivers/net/usb
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-config.h linux-2.6.32.45/drivers/net/vxge/vxge-config.h
---- linux-2.6.32.45/drivers/net/vxge/vxge-config.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/vxge/vxge-config.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-config.h linux-2.6.32.46/drivers/net/vxge/vxge-config.h
+--- linux-2.6.32.46/drivers/net/vxge/vxge-config.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/vxge/vxge-config.h	2011-08-05 20:33:55.000000000 -0400
 @@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs {
  	void (*link_down)(struct __vxge_hw_device *devh);
  	void (*crit_err)(struct __vxge_hw_device *devh,
@@ -34858,9 +34875,9 @@ diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-config.h linux-2.6.32.45/driver
  
  /*
   * struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-main.c linux-2.6.32.45/drivers/net/vxge/vxge-main.c
---- linux-2.6.32.45/drivers/net/vxge/vxge-main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/vxge/vxge-main.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-main.c linux-2.6.32.46/drivers/net/vxge/vxge-main.c
+--- linux-2.6.32.46/drivers/net/vxge/vxge-main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/vxge/vxge-main.c	2011-05-16 21:46:57.000000000 -0400
 @@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_T
  	struct sk_buff *completed[NR_SKB_COMPLETED];
  	int more;
@@ -34879,9 +34896,9 @@ diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-main.c linux-2.6.32.45/drivers/
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
-diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h
---- linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h
+--- linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/vxge/vxge-traffic.h	2011-08-05 20:33:55.000000000 -0400
 @@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs {
  			struct vxge_hw_mempool_dma	*dma_object,
  			u32			index,
@@ -34891,9 +34908,9 @@ diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h linux-2.6.32.45/drive
  
  void
  __vxge_hw_mempool_destroy(
-diff -urNp linux-2.6.32.45/drivers/net/wan/cycx_x25.c linux-2.6.32.45/drivers/net/wan/cycx_x25.c
---- linux-2.6.32.45/drivers/net/wan/cycx_x25.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wan/cycx_x25.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wan/cycx_x25.c linux-2.6.32.46/drivers/net/wan/cycx_x25.c
+--- linux-2.6.32.46/drivers/net/wan/cycx_x25.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wan/cycx_x25.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned
  	unsigned char hex[1024],
  	    	* phex = hex;
@@ -34903,9 +34920,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wan/cycx_x25.c linux-2.6.32.45/drivers/ne
  	if (len >= (sizeof(hex) / 2))
  		len = (sizeof(hex) / 2) - 1;
  
-diff -urNp linux-2.6.32.45/drivers/net/wan/hdlc_x25.c linux-2.6.32.45/drivers/net/wan/hdlc_x25.c
---- linux-2.6.32.45/drivers/net/wan/hdlc_x25.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wan/hdlc_x25.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wan/hdlc_x25.c linux-2.6.32.46/drivers/net/wan/hdlc_x25.c
+--- linux-2.6.32.46/drivers/net/wan/hdlc_x25.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wan/hdlc_x25.c	2011-08-05 20:33:55.000000000 -0400
 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
  
  static int x25_open(struct net_device *dev)
@@ -34931,9 +34948,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wan/hdlc_x25.c linux-2.6.32.45/drivers/ne
  	result = lapb_register(dev, &cb);
  	if (result != LAPB_OK)
  		return result;
-diff -urNp linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c
---- linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wimax/i2400m/usb-fw.c	2011-05-16 21:46:57.000000000 -0400
 @@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
  	int do_autopm = 1;
  	DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -34943,9 +34960,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.32.45/dri
  	d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
  		  i2400m, ack, ack_size);
  	BUG_ON(_ack == i2400m->bm_ack_buf);
-diff -urNp linux-2.6.32.45/drivers/net/wireless/airo.c linux-2.6.32.45/drivers/net/wireless/airo.c
---- linux-2.6.32.45/drivers/net/wireless/airo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/airo.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/airo.c linux-2.6.32.46/drivers/net/wireless/airo.c
+--- linux-2.6.32.46/drivers/net/wireless/airo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/airo.c	2011-05-16 21:46:57.000000000 -0400
 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
  	BSSListElement * loop_net;
  	BSSListElement * tmp_net;
@@ -35000,9 +35017,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/airo.c linux-2.6.32.45/drivers/n
  	/* Get stats out of the card */
  	clear_bit(JOB_WSTATS, &local->jobs);
  	if (local->power.event) {
-diff -urNp linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c
---- linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/ath/ath5k/debug.c	2011-05-16 21:46:57.000000000 -0400
 @@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct f
  	unsigned int v;
  	u64 tsf;
@@ -35021,9 +35038,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c linux-2.6.32.4
  	len += snprintf(buf+len, sizeof(buf)-len,
  		"DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
  
-diff -urNp linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c
---- linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/ath/ath9k/debug.c	2011-05-16 21:46:57.000000000 -0400
 @@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struc
  	char buf[512];
  	unsigned int len = 0;
@@ -35042,9 +35059,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c linux-2.6.32.4
  	len += snprintf(buf + len, sizeof(buf) - len,
  			"primary: %s (%s chan=%d ht=%d)\n",
  			wiphy_name(sc->pri_wiphy->hw->wiphy),
-diff -urNp linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/b43/debugfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
  struct b43_debugfs_fops {
  	ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -35054,9 +35071,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c linux-2.6.32.45/dr
  	/* Offset of struct b43_dfs_file in struct b43_dfsentry */
  	size_t file_struct_offset;
  };
-diff -urNp linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/b43legacy/debugfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
  struct b43legacy_debugfs_fops {
  	ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -35066,9 +35083,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
  	/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
  	size_t file_struct_offset;
  	/* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/ipw2x00/ipw2100.c	2011-05-16 21:46:57.000000000 -0400
 @@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2
  	int err;
  	DECLARE_SSID_BUF(ssid);
@@ -35087,9 +35104,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c linux-2.6.32.4
  	IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
  		     idx, keylen, len);
  
-diff -urNp linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1566,6 +1566,8 @@ static void libipw_process_probe_respons
  	unsigned long flags;
  	DECLARE_SSID_BUF(ssid);
@@ -35099,9 +35116,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c linux-2.6.32
  	LIBIPW_DEBUG_SCAN("'%s' (%pM"
  		     "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
  		     print_ssid(ssid, info_element->data, info_element->len),
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 
  	 },
  };
@@ -35111,9 +35128,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl1000_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-08-05 20:33:55.000000000 -0400
 @@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_
  	 */
  	if (iwl3945_mod_params.disable_hw_scan) {
@@ -35125,9 +35142,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6
  	}
  
  
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
  	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
  };
@@ -35137,9 +35154,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
  	.ucode = &iwl3945_ucode,
  	.lib = &iwl3945_lib,
  	.hcmd = &iwl3945_hcmd,
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-4965.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = 
  	},
  };
@@ -35149,9 +35166,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
  	.ucode = &iwl4965_ucode,
  	.lib = &iwl4965_lib,
  	.hcmd = &iwl4965_hcmd,
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-5000.c	2011-06-25 12:56:37.000000000 -0400
 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = 
  	 },
  };
@@ -35169,9 +35186,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl5150_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c	2011-04-17 15:56:46.000000000 -0400
 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
  	.calc_rssi = iwl5000_calc_rssi,
  };
@@ -35181,9 +35198,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl6000_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev 
  		if (iwl_debug_level & IWL_DL_INFO)
  			dev_printk(KERN_DEBUG, &(pdev->dev),
@@ -35195,9 +35212,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.4
  	}
  
  	hw = iwl_alloc_all(cfg, &iwl_hw_ops);
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, s
  	u8 active_index = 0;
  	s32 tpt = 0;
@@ -35216,9 +35233,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.3
  	/* Override starting rate (index 0) if needed for debug purposes */
  	rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(str
  	int pos = 0;
  	const size_t bufsz = sizeof(buf);
@@ -35237,9 +35254,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.
  	for (i = 0; i < AC_NUM; i++) {
  		pos += scnprintf(buf + pos, bufsz - pos,
  			"\tcw_min\tcw_max\taifsn\ttxop\n");
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-17 15:56:46.000000000 -0400
 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
  #endif
  
@@ -35251,9 +35268,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      void *p, u32 len)
  {}
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-04-17 15:56:46.000000000 -0400
 @@ -68,7 +68,7 @@ struct iwl_tx_queue;
  
  /* shared structures from iwl-5000.c */
@@ -35263,9 +35280,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.4
  extern struct iwl_ucode_ops iwl5000_ucode;
  extern struct iwl_lib_ops iwl5000_lib;
  extern struct iwl_hcmd_ops iwl5000_hcmd;
-diff -urNp linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
  	int buf_len = 512;
  	size_t len = 0;
@@ -35275,9 +35292,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6
  	if (*ppos != 0)
  		return 0;
  	if (count < sizeof(buf))
-diff -urNp linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/libertas/debugfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -708,7 +708,7 @@ out_unlock:
  struct lbs_debugfs_files {
  	const char *name;
@@ -35287,9 +35304,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
  };
  
  static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/rndis_wlan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
  
  	devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -35299,9 +35316,9 @@ diff -urNp linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c linux-2.6.32.45/dri
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.32.45/drivers/oprofile/buffer_sync.c linux-2.6.32.45/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.45/drivers/oprofile/buffer_sync.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/oprofile/buffer_sync.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/oprofile/buffer_sync.c linux-2.6.32.46/drivers/oprofile/buffer_sync.c
+--- linux-2.6.32.46/drivers/oprofile/buffer_sync.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/buffer_sync.c	2011-04-17 15:56:46.000000000 -0400
 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
@@ -35337,9 +35354,9 @@ diff -urNp linux-2.6.32.45/drivers/oprofile/buffer_sync.c linux-2.6.32.45/driver
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-2.6.32.45/drivers/oprofile/event_buffer.c linux-2.6.32.45/drivers/oprofile/event_buffer.c
---- linux-2.6.32.45/drivers/oprofile/event_buffer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/oprofile/event_buffer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/oprofile/event_buffer.c linux-2.6.32.46/drivers/oprofile/event_buffer.c
+--- linux-2.6.32.46/drivers/oprofile/event_buffer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/event_buffer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -35349,9 +35366,9 @@ diff -urNp linux-2.6.32.45/drivers/oprofile/event_buffer.c linux-2.6.32.45/drive
  		return;
  	}
  
-diff -urNp linux-2.6.32.45/drivers/oprofile/oprof.c linux-2.6.32.45/drivers/oprofile/oprof.c
---- linux-2.6.32.45/drivers/oprofile/oprof.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/oprofile/oprof.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/oprofile/oprof.c linux-2.6.32.46/drivers/oprofile/oprof.c
+--- linux-2.6.32.46/drivers/oprofile/oprof.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/oprof.c	2011-04-17 15:56:46.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
@@ -35361,9 +35378,9 @@ diff -urNp linux-2.6.32.45/drivers/oprofile/oprof.c linux-2.6.32.45/drivers/opro
  	start_switch_worker();
  }
  
-diff -urNp linux-2.6.32.45/drivers/oprofile/oprofilefs.c linux-2.6.32.45/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.45/drivers/oprofile/oprofilefs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/oprofile/oprofilefs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/oprofile/oprofilefs.c linux-2.6.32.46/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.46/drivers/oprofile/oprofilefs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/oprofilefs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -187,7 +187,7 @@ static const struct file_operations atom
  
  
@@ -35373,9 +35390,9 @@ diff -urNp linux-2.6.32.45/drivers/oprofile/oprofilefs.c linux-2.6.32.45/drivers
  {
  	struct dentry *d = __oprofilefs_create_file(sb, root, name,
  						     &atomic_ro_fops, 0444);
-diff -urNp linux-2.6.32.45/drivers/oprofile/oprofile_stats.c linux-2.6.32.45/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.45/drivers/oprofile/oprofile_stats.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/oprofile/oprofile_stats.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.c linux-2.6.32.46/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.32.46/drivers/oprofile/oprofile_stats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.c	2011-04-17 15:56:46.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -35393,9 +35410,9 @@ diff -urNp linux-2.6.32.45/drivers/oprofile/oprofile_stats.c linux-2.6.32.45/dri
  }
  
  
-diff -urNp linux-2.6.32.45/drivers/oprofile/oprofile_stats.h linux-2.6.32.45/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.45/drivers/oprofile/oprofile_stats.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/oprofile/oprofile_stats.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.h linux-2.6.32.46/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.32.46/drivers/oprofile/oprofile_stats.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -35413,9 +35430,9 @@ diff -urNp linux-2.6.32.45/drivers/oprofile/oprofile_stats.h linux-2.6.32.45/dri
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.32.45/drivers/parisc/pdc_stable.c linux-2.6.32.45/drivers/parisc/pdc_stable.c
---- linux-2.6.32.45/drivers/parisc/pdc_stable.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/parisc/pdc_stable.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/parisc/pdc_stable.c linux-2.6.32.46/drivers/parisc/pdc_stable.c
+--- linux-2.6.32.46/drivers/parisc/pdc_stable.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/parisc/pdc_stable.c	2011-04-17 15:56:46.000000000 -0400
 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
  	return ret;
  }
@@ -35425,9 +35442,9 @@ diff -urNp linux-2.6.32.45/drivers/parisc/pdc_stable.c linux-2.6.32.45/drivers/p
  	.show = pdcspath_attr_show,
  	.store = pdcspath_attr_store,
  };
-diff -urNp linux-2.6.32.45/drivers/parport/procfs.c linux-2.6.32.45/drivers/parport/procfs.c
---- linux-2.6.32.45/drivers/parport/procfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/parport/procfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/parport/procfs.c linux-2.6.32.46/drivers/parport/procfs.c
+--- linux-2.6.32.46/drivers/parport/procfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/parport/procfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
@@ -35446,9 +35463,9 @@ diff -urNp linux-2.6.32.45/drivers/parport/procfs.c linux-2.6.32.45/drivers/parp
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/hotplug/acpiphp_glue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
  }
  
@@ -35458,9 +35475,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.45/dr
  	.handler = handle_hotplug_event_func,
  };
  
-diff -urNp linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h
---- linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/hotplug/cpci_hotplug.h	2011-08-05 20:33:55.000000000 -0400
 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
  	int (*hardware_test) (struct slot* slot, u32 value);
  	u8  (*get_power) (struct slot* slot);
@@ -35470,9 +35487,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.32.45/dr
  
  struct cpci_hp_controller {
  	unsigned int irq;
-diff -urNp linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/hotplug/cpqphp_nvram.c	2011-04-17 15:56:46.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -35487,9 +35504,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.45/dr
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-2.6.32.45/drivers/pci/hotplug/fakephp.c linux-2.6.32.45/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.45/drivers/pci/hotplug/fakephp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/hotplug/fakephp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/hotplug/fakephp.c linux-2.6.32.46/drivers/pci/hotplug/fakephp.c
+--- linux-2.6.32.46/drivers/pci/hotplug/fakephp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/hotplug/fakephp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
  }
  
@@ -35499,9 +35516,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/hotplug/fakephp.c linux-2.6.32.45/drivers
  		.store = legacy_store, .show = legacy_show
  	},
  	.release = &legacy_release,
-diff -urNp linux-2.6.32.45/drivers/pci/intel-iommu.c linux-2.6.32.45/drivers/pci/intel-iommu.c
---- linux-2.6.32.45/drivers/pci/intel-iommu.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/intel-iommu.c	2011-05-10 22:12:33.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/intel-iommu.c linux-2.6.32.46/drivers/pci/intel-iommu.c
+--- linux-2.6.32.46/drivers/pci/intel-iommu.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/intel-iommu.c	2011-05-10 22:12:33.000000000 -0400
 @@ -2643,7 +2643,7 @@ error:
  	return 0;
  }
@@ -35571,9 +35588,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/intel-iommu.c linux-2.6.32.45/drivers/pci
  	.alloc_coherent = intel_alloc_coherent,
  	.free_coherent = intel_free_coherent,
  	.map_sg = intel_map_sg,
-diff -urNp linux-2.6.32.45/drivers/pci/pcie/aspm.c linux-2.6.32.45/drivers/pci/pcie/aspm.c
---- linux-2.6.32.45/drivers/pci/pcie/aspm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/pcie/aspm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/pcie/aspm.c linux-2.6.32.46/drivers/pci/pcie/aspm.c
+--- linux-2.6.32.46/drivers/pci/pcie/aspm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/pcie/aspm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -35587,9 +35604,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/pcie/aspm.c linux-2.6.32.45/drivers/pci/p
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-2.6.32.45/drivers/pci/probe.c linux-2.6.32.45/drivers/pci/probe.c
---- linux-2.6.32.45/drivers/pci/probe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/probe.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/probe.c linux-2.6.32.46/drivers/pci/probe.c
+--- linux-2.6.32.46/drivers/pci/probe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/probe.c	2011-04-17 15:56:46.000000000 -0400
 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
  	return ret;
  }
@@ -35607,9 +35624,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/probe.c linux-2.6.32.45/drivers/pci/probe
  					struct device_attribute *attr,
  					char *buf)
  {
-diff -urNp linux-2.6.32.45/drivers/pci/proc.c linux-2.6.32.45/drivers/pci/proc.c
---- linux-2.6.32.45/drivers/pci/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/proc.c linux-2.6.32.46/drivers/pci/proc.c
+--- linux-2.6.32.46/drivers/pci/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -480,7 +480,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -35627,9 +35644,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/proc.c linux-2.6.32.45/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-2.6.32.45/drivers/pci/slot.c linux-2.6.32.45/drivers/pci/slot.c
---- linux-2.6.32.45/drivers/pci/slot.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pci/slot.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pci/slot.c linux-2.6.32.46/drivers/pci/slot.c
+--- linux-2.6.32.46/drivers/pci/slot.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pci/slot.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
  	return attribute->store ? attribute->store(slot, buf, len) : -EIO;
  }
@@ -35639,9 +35656,9 @@ diff -urNp linux-2.6.32.45/drivers/pci/slot.c linux-2.6.32.45/drivers/pci/slot.c
  	.show = pci_slot_attr_show,
  	.store = pci_slot_attr_store,
  };
-diff -urNp linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c
+--- linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pcmcia/pcmcia_ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
  	    return -EFAULT;
  	}
@@ -35651,9 +35668,9 @@ diff -urNp linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.45/drivers
      if (!buf)
  	return -ENOMEM;
  
-diff -urNp linux-2.6.32.45/drivers/platform/x86/acer-wmi.c linux-2.6.32.45/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.45/drivers/platform/x86/acer-wmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/acer-wmi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/acer-wmi.c linux-2.6.32.46/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.32.46/drivers/platform/x86/acer-wmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/acer-wmi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -918,7 +918,7 @@ static int update_bl_status(struct backl
  	return 0;
  }
@@ -35663,9 +35680,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/acer-wmi.c linux-2.6.32.45/drive
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/asus_acpi.c linux-2.6.32.45/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.45/drivers/platform/x86/asus_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/asus_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/asus_acpi.c linux-2.6.32.46/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.46/drivers/platform/x86/asus_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/asus_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
  	return 0;
  }
@@ -35675,9 +35692,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/asus_acpi.c linux-2.6.32.45/driv
  	.get_brightness = read_brightness,
  	.update_status  = set_brightness_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/asus-laptop.c linux-2.6.32.45/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/asus-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/asus-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/asus-laptop.c linux-2.6.32.46/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/asus-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/asus-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
   */
  static int read_brightness(struct backlight_device *bd);
@@ -35687,9 +35704,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/asus-laptop.c linux-2.6.32.45/dr
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/compal-laptop.c linux-2.6.32.45/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/compal-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/compal-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/compal-laptop.c linux-2.6.32.46/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/compal-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/compal-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl
  	return set_lcd_level(b->props.brightness);
  }
@@ -35699,9 +35716,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/compal-laptop.c linux-2.6.32.45/
  	.get_brightness = bl_get_brightness,
  	.update_status	= bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/dell-laptop.c linux-2.6.32.45/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/dell-laptop.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/dell-laptop.c	2011-05-10 22:12:33.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/dell-laptop.c linux-2.6.32.46/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/dell-laptop.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/dell-laptop.c	2011-05-10 22:12:33.000000000 -0400
 @@ -318,7 +318,7 @@ static int dell_get_intensity(struct bac
  	return buffer.output[1];
  }
@@ -35711,9 +35728,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/dell-laptop.c linux-2.6.32.45/dr
  	.get_brightness = dell_get_intensity,
  	.update_status  = dell_send_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/eeepc-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
   */
  static int read_brightness(struct backlight_device *bd);
@@ -35723,9 +35740,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.45/d
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/fujitsu-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -436,7 +436,7 @@ static int bl_update_status(struct backl
  	return ret;
  }
@@ -35735,9 +35752,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.45
  	.get_brightness = bl_get_brightness,
  	.update_status = bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/msi-laptop.c linux-2.6.32.45/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/msi-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/msi-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/msi-laptop.c linux-2.6.32.46/drivers/platform/x86/msi-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/msi-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/msi-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl
  	return set_lcd_level(b->props.brightness);
  }
@@ -35747,9 +35764,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/msi-laptop.c linux-2.6.32.45/dri
  	.get_brightness = bl_get_brightness,
  	.update_status  = bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/panasonic-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
  	return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
  }
@@ -35759,9 +35776,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
  	.get_brightness	= bl_get,
  	.update_status	= bl_set_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/sony-laptop.c linux-2.6.32.45/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.45/drivers/platform/x86/sony-laptop.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/sony-laptop.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/sony-laptop.c linux-2.6.32.46/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.32.46/drivers/platform/x86/sony-laptop.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/sony-laptop.c	2011-04-17 15:56:46.000000000 -0400
 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
  }
  
@@ -35771,9 +35788,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/sony-laptop.c linux-2.6.32.45/dr
  	.update_status = sony_backlight_update_status,
  	.get_brightness = sony_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/thinkpad_acpi.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2137,7 +2137,7 @@ static int hotkey_mask_get(void)
  	return 0;
  }
@@ -35792,9 +35809,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.45/
  	.get_brightness = brightness_get,
  	.update_status  = brightness_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/toshiba_acpi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -671,7 +671,7 @@ static acpi_status remove_device(void)
  	return AE_OK;
  }
@@ -35804,9 +35821,9 @@ diff -urNp linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.45/d
          .get_brightness = get_lcd,
          .update_status  = set_lcd_status,
  };
-diff -urNp linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pnp/pnpbios/bioscalls.c	2011-04-17 15:56:46.000000000 -0400
 @@ -60,7 +60,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -35863,9 +35880,9 @@ diff -urNp linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.45/drive
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-2.6.32.45/drivers/pnp/resource.c linux-2.6.32.45/drivers/pnp/resource.c
---- linux-2.6.32.45/drivers/pnp/resource.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/pnp/resource.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/pnp/resource.c linux-2.6.32.46/drivers/pnp/resource.c
+--- linux-2.6.32.46/drivers/pnp/resource.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/pnp/resource.c	2011-04-17 15:56:46.000000000 -0400
 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
@@ -35884,9 +35901,9 @@ diff -urNp linux-2.6.32.45/drivers/pnp/resource.c linux-2.6.32.45/drivers/pnp/re
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-2.6.32.45/drivers/power/bq27x00_battery.c linux-2.6.32.45/drivers/power/bq27x00_battery.c
---- linux-2.6.32.45/drivers/power/bq27x00_battery.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/power/bq27x00_battery.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/power/bq27x00_battery.c linux-2.6.32.46/drivers/power/bq27x00_battery.c
+--- linux-2.6.32.46/drivers/power/bq27x00_battery.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/power/bq27x00_battery.c	2011-08-05 20:33:55.000000000 -0400
 @@ -44,7 +44,7 @@ struct bq27x00_device_info;
  struct bq27x00_access_methods {
  	int (*read)(u8 reg, int *rt_value, int b_single,
@@ -35896,9 +35913,9 @@ diff -urNp linux-2.6.32.45/drivers/power/bq27x00_battery.c linux-2.6.32.45/drive
  
  struct bq27x00_device_info {
  	struct device 		*dev;
-diff -urNp linux-2.6.32.45/drivers/rtc/rtc-dev.c linux-2.6.32.45/drivers/rtc/rtc-dev.c
---- linux-2.6.32.45/drivers/rtc/rtc-dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/rtc/rtc-dev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/rtc/rtc-dev.c linux-2.6.32.46/drivers/rtc/rtc-dev.c
+--- linux-2.6.32.46/drivers/rtc/rtc-dev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/rtc/rtc-dev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -35916,9 +35933,9 @@ diff -urNp linux-2.6.32.45/drivers/rtc/rtc-dev.c linux-2.6.32.45/drivers/rtc/rtc
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-2.6.32.45/drivers/s390/cio/qdio_perf.c linux-2.6.32.45/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.45/drivers/s390/cio/qdio_perf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/s390/cio/qdio_perf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.c linux-2.6.32.46/drivers/s390/cio/qdio_perf.c
+--- linux-2.6.32.46/drivers/s390/cio/qdio_perf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/s390/cio/qdio_perf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
  static int qdio_perf_proc_show(struct seq_file *m, void *v)
  {
@@ -35994,9 +36011,9 @@ diff -urNp linux-2.6.32.45/drivers/s390/cio/qdio_perf.c linux-2.6.32.45/drivers/
  	seq_printf(m, "\n");
  	return 0;
  }
-diff -urNp linux-2.6.32.45/drivers/s390/cio/qdio_perf.h linux-2.6.32.45/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.45/drivers/s390/cio/qdio_perf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/s390/cio/qdio_perf.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.h linux-2.6.32.46/drivers/s390/cio/qdio_perf.h
+--- linux-2.6.32.46/drivers/s390/cio/qdio_perf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/s390/cio/qdio_perf.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,46 +13,46 @@
  
  struct qdio_perf_stats {
@@ -36069,9 +36086,9 @@ diff -urNp linux-2.6.32.45/drivers/s390/cio/qdio_perf.h linux-2.6.32.45/drivers/
  }
  
  int qdio_setup_perf_stats(void);
-diff -urNp linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h
---- linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h
+--- linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h	2011-08-05 20:33:55.000000000 -0400
 @@ -471,7 +471,7 @@ struct adapter_ops
  	int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
  	/* Administrative operations */
@@ -36081,9 +36098,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h linux-2.6.32.45/driver
  
  /*
   *	Define which interrupt handler needs to be installed
-diff -urNp linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c
---- linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c
+--- linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/aacraid/commctrl.c	2011-05-16 21:46:57.000000000 -0400
 @@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_d
  	u32 actual_fibsize64, actual_fibsize = 0;
  	int i;
@@ -36092,9 +36109,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c linux-2.6.32.45/drive
  
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c
---- linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c	2011-04-17 15:56:46.000000000 -0400
 @@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru
  			flash_error_table[i].reason);
  }
@@ -36104,9 +36121,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.45/d
  	asd_show_update_bios, asd_store_update_bios);
  
  static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h
---- linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h
+--- linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h	2011-08-05 20:33:55.000000000 -0400
 @@ -61,7 +61,7 @@ struct bfa_hwif_s {
  	void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
  	void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
@@ -36116,9 +36133,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.45/drivers/
  typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
  
  struct bfa_iocfc_s {
-diff -urNp linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h
---- linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h
+--- linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h	2011-08-05 20:33:55.000000000 -0400
 @@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s {
  	bfa_ioc_disable_cbfn_t	disable_cbfn;
  	bfa_ioc_hbfail_cbfn_t	hbfail_cbfn;
@@ -36128,9 +36145,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.45/drivers/sc
  
  /**
   * Heartbeat failure notification queue element.
-diff -urNp linux-2.6.32.45/drivers/scsi/BusLogic.c linux-2.6.32.45/drivers/scsi/BusLogic.c
---- linux-2.6.32.45/drivers/scsi/BusLogic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/BusLogic.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/BusLogic.c linux-2.6.32.46/drivers/scsi/BusLogic.c
+--- linux-2.6.32.46/drivers/scsi/BusLogic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/BusLogic.c	2011-05-16 21:46:57.000000000 -0400
 @@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla
  static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
  						    *PrototypeHostAdapter)
@@ -36140,9 +36157,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/BusLogic.c linux-2.6.32.45/drivers/scsi/
  	/*
  	   If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
  	   Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
-diff -urNp linux-2.6.32.45/drivers/scsi/dpt_i2o.c linux-2.6.32.45/drivers/scsi/dpt_i2o.c
---- linux-2.6.32.45/drivers/scsi/dpt_i2o.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/dpt_i2o.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/dpt_i2o.c linux-2.6.32.46/drivers/scsi/dpt_i2o.c
+--- linux-2.6.32.46/drivers/scsi/dpt_i2o.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/dpt_i2o.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* p
  	dma_addr_t addr;
  	ulong flags = 0;
@@ -36161,9 +36178,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/dpt_i2o.c linux-2.6.32.45/drivers/scsi/d
  	memset(msg, 0 , sizeof(msg));
  	len = scsi_bufflen(cmd);
  	direction = 0x00000000;	
-diff -urNp linux-2.6.32.45/drivers/scsi/eata.c linux-2.6.32.45/drivers/scsi/eata.c
---- linux-2.6.32.45/drivers/scsi/eata.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/eata.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/eata.c linux-2.6.32.46/drivers/scsi/eata.c
+--- linux-2.6.32.46/drivers/scsi/eata.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/eata.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
  	struct hostdata *ha;
  	char name[16];
@@ -36173,9 +36190,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/eata.c linux-2.6.32.45/drivers/scsi/eata
  	sprintf(name, "%s%d", driver_name, j);
  
  	if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c
---- linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c
+--- linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/fcoe/libfcoe.c	2011-05-16 21:46:57.000000000 -0400
 @@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fc
  	size_t rlen;
  	size_t dlen;
@@ -36185,9 +36202,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.45/drivers/s
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  	if (sub != FIP_SC_REQ && sub != FIP_SC_REP)
-diff -urNp linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c
---- linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c
+--- linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/fnic/fnic_main.c	2011-08-05 20:33:55.000000000 -0400
 @@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct p
  	/* Start local port initiatialization */
  
@@ -36197,9 +36214,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c linux-2.6.32.45/drivers
  
  	lp->max_retry_count = fnic->config.flogi_retries;
  	lp->max_rport_retry_count = fnic->config.plogi_retries;
-diff -urNp linux-2.6.32.45/drivers/scsi/gdth.c linux-2.6.32.45/drivers/scsi/gdth.c
---- linux-2.6.32.45/drivers/scsi/gdth.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/gdth.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/gdth.c linux-2.6.32.46/drivers/scsi/gdth.c
+--- linux-2.6.32.46/drivers/scsi/gdth.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/gdth.c	2011-05-16 21:46:57.000000000 -0400
 @@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg)
      ulong flags;
      gdth_ha_str *ha;
@@ -36237,9 +36254,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/gdth.c linux-2.6.32.45/drivers/scsi/gdth
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-2.6.32.45/drivers/scsi/gdth_proc.c linux-2.6.32.45/drivers/scsi/gdth_proc.c
---- linux-2.6.32.45/drivers/scsi/gdth_proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/gdth_proc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/gdth_proc.c linux-2.6.32.46/drivers/scsi/gdth_proc.c
+--- linux-2.6.32.46/drivers/scsi/gdth_proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/gdth_proc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi
      ulong64         paddr;
  
@@ -36259,9 +36276,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/gdth_proc.c linux-2.6.32.45/drivers/scsi
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-2.6.32.45/drivers/scsi/hosts.c linux-2.6.32.45/drivers/scsi/hosts.c
---- linux-2.6.32.45/drivers/scsi/hosts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/hosts.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/hosts.c linux-2.6.32.46/drivers/scsi/hosts.c
+--- linux-2.6.32.46/drivers/scsi/hosts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/hosts.c	2011-05-04 17:56:28.000000000 -0400
 @@ -40,7 +40,7 @@
  #include "scsi_logging.h"
  
@@ -36280,9 +36297,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/hosts.c linux-2.6.32.45/drivers/scsi/hos
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff -urNp linux-2.6.32.45/drivers/scsi/ipr.c linux-2.6.32.45/drivers/scsi/ipr.c
---- linux-2.6.32.45/drivers/scsi/ipr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/ipr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/ipr.c linux-2.6.32.46/drivers/scsi/ipr.c
+--- linux-2.6.32.46/drivers/scsi/ipr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/ipr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
  	return true;
  }
@@ -36292,9 +36309,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/ipr.c linux-2.6.32.45/drivers/scsi/ipr.c
  	.phy_reset = ipr_ata_phy_reset,
  	.hardreset = ipr_sata_reset,
  	.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.32.45/drivers/scsi/ips.h linux-2.6.32.45/drivers/scsi/ips.h
---- linux-2.6.32.45/drivers/scsi/ips.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/ips.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/ips.h linux-2.6.32.46/drivers/scsi/ips.h
+--- linux-2.6.32.46/drivers/scsi/ips.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/ips.h	2011-08-05 20:33:55.000000000 -0400
 @@ -1027,7 +1027,7 @@ typedef struct {
     int       (*intr)(struct ips_ha *);
     void      (*enableint)(struct ips_ha *);
@@ -36304,9 +36321,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/ips.h linux-2.6.32.45/drivers/scsi/ips.h
  
  typedef struct ips_ha {
     uint8_t            ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/libfc/fc_exch.c	2011-08-23 21:22:32.000000000 -0400
 @@ -86,12 +86,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -36428,9 +36445,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c linux-2.6.32.45/drivers/
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c	2011-04-23 12:56:11.000000000 -0400
 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
  	}
  }
@@ -36440,9 +36457,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c linux-2.6.32.45/drivers
  	.phy_reset		= sas_ata_phy_reset,
  	.post_internal_cmd	= sas_ata_post_internal,
  	.qc_defer               = ata_std_qc_defer,
-diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -124,7 +124,7 @@ struct lpfc_debug {
  	int  len;
  };
@@ -36531,9 +36548,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.45/driv
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h
---- linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h
+--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h	2011-05-04 17:56:28.000000000 -0400
 @@ -400,7 +400,7 @@ struct lpfc_vport {
  	struct dentry *debug_nodelist;
  	struct dentry *vport_debugfs_root;
@@ -36563,9 +36580,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h linux-2.6.32.45/drivers/scsi
  #endif
  
  	/* Used for deferred freeing of ELS data buffers */
-diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c
---- linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c
+--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c	2011-08-05 20:33:55.000000000 -0400
 @@ -8021,8 +8021,10 @@ lpfc_init(void)
  	printk(LPFC_COPYRIGHT "\n");
  
@@ -36579,9 +36596,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.45/drivers
  	}
  	lpfc_transport_template =
  				fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_scsi.c	2011-05-04 17:56:28.000000000 -0400
 @@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
@@ -36633,9 +36650,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.45/drivers
  }
  
  /**
-diff -urNp linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/megaraid/megaraid_mbox.c	2011-05-16 21:46:57.000000000 -0400
 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
  	int		rval;
  	int		i;
@@ -36645,9 +36662,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c linux-2.6.32.45
  	// Allocate memory for the base list of scb for management module.
  	adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
  
-diff -urNp linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c
---- linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c
+--- linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/osd/osd_initiator.c	2011-05-16 21:46:57.000000000 -0400
 @@ -94,6 +94,8 @@ static int _osd_print_system_info(struct
  	int nelem = ARRAY_SIZE(get_attrs), a = 0;
  	int ret;
@@ -36657,9 +36674,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c linux-2.6.32.45/driv
  	or = osd_start_request(od, GFP_KERNEL);
  	if (!or)
  		return -ENOMEM;
-diff -urNp linux-2.6.32.45/drivers/scsi/pmcraid.c linux-2.6.32.45/drivers/scsi/pmcraid.c
---- linux-2.6.32.45/drivers/scsi/pmcraid.c	2011-08-09 18:35:29.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/pmcraid.c	2011-08-09 18:33:59.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.c linux-2.6.32.46/drivers/scsi/pmcraid.c
+--- linux-2.6.32.46/drivers/scsi/pmcraid.c	2011-08-09 18:35:29.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/pmcraid.c	2011-08-09 18:33:59.000000000 -0400
 @@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct sc
  		res->scsi_dev = scsi_dev;
  		scsi_dev->hostdata = res;
@@ -36710,9 +36727,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/pmcraid.c linux-2.6.32.45/drivers/scsi/p
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff -urNp linux-2.6.32.45/drivers/scsi/pmcraid.h linux-2.6.32.45/drivers/scsi/pmcraid.h
---- linux-2.6.32.45/drivers/scsi/pmcraid.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/pmcraid.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/pmcraid.h linux-2.6.32.46/drivers/scsi/pmcraid.h
+--- linux-2.6.32.46/drivers/scsi/pmcraid.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/pmcraid.h	2011-05-04 17:56:28.000000000 -0400
 @@ -690,7 +690,7 @@ struct pmcraid_instance {
  	atomic_t outstanding_cmds;
  
@@ -36733,9 +36750,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/pmcraid.h linux-2.6.32.45/drivers/scsi/p
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff -urNp linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h
---- linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h
+--- linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/qla2xxx/qla_def.h	2011-08-05 20:33:55.000000000 -0400
 @@ -2089,7 +2089,7 @@ struct isp_operations {
  
  	int (*get_flash_version) (struct scsi_qla_host *, void *);
@@ -36745,9 +36762,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.45/driver
  
  /* MSI-X Support *************************************************************/
  
-diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h
---- linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_def.h	2011-05-04 17:56:28.000000000 -0400
 @@ -240,7 +240,7 @@ struct ddb_entry {
  	atomic_t retry_relogin_timer; /* Min Time between relogins
  				       * (4000 only) */
@@ -36757,9 +36774,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.45/driver
  				       * retried */
  
  	uint16_t port;
-diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c
---- linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_init.c	2011-05-04 17:56:28.000000000 -0400
 @@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_
  	atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count);
  	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -36778,9 +36795,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.45/drive
  		atomic_set(&ddb_entry->relogin_timer, 0);
  		clear_bit(DF_RELOGIN, &ddb_entry->flags);
  		clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
-diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c
---- linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/qla4xxx/ql4_os.c	2011-05-04 17:56:28.000000000 -0400
 @@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_ql
  			    ddb_entry->fw_ddb_device_state ==
  			    DDB_DS_SESSION_FAILED) {
@@ -36797,9 +36814,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.45/drivers
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi.c linux-2.6.32.45/drivers/scsi/scsi.c
---- linux-2.6.32.45/drivers/scsi/scsi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi.c linux-2.6.32.46/drivers/scsi/scsi.c
+--- linux-2.6.32.46/drivers/scsi/scsi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi.c	2011-05-04 17:56:28.000000000 -0400
 @@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
  	unsigned long timeout;
  	int rtn = 0;
@@ -36809,9 +36826,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi.c linux-2.6.32.45/drivers/scsi/scsi
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi_debug.c linux-2.6.32.45/drivers/scsi/scsi_debug.c
---- linux-2.6.32.45/drivers/scsi/scsi_debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi_debug.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi_debug.c linux-2.6.32.46/drivers/scsi/scsi_debug.c
+--- linux-2.6.32.46/drivers/scsi/scsi_debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi_debug.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_
  	unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
  	unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -36830,9 +36847,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi_debug.c linux-2.6.32.45/drivers/scs
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi_lib.c linux-2.6.32.45/drivers/scsi/scsi_lib.c
---- linux-2.6.32.45/drivers/scsi/scsi_lib.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi_lib.c	2011-05-10 22:12:33.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi_lib.c linux-2.6.32.46/drivers/scsi/scsi_lib.c
+--- linux-2.6.32.46/drivers/scsi/scsi_lib.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi_lib.c	2011-05-10 22:12:33.000000000 -0400
 @@ -1384,7 +1384,7 @@ static void scsi_kill_request(struct req
  
  	scsi_init_cmd_errh(cmd);
@@ -36854,9 +36871,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi_lib.c linux-2.6.32.45/drivers/scsi/
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi_sysfs.c linux-2.6.32.45/drivers/scsi/scsi_sysfs.c
---- linux-2.6.32.45/drivers/scsi/scsi_sysfs.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi_sysfs.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi_sysfs.c linux-2.6.32.46/drivers/scsi/scsi_sysfs.c
+--- linux-2.6.32.46/drivers/scsi/scsi_sysfs.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi_sysfs.c	2011-06-25 12:56:37.000000000 -0400
 @@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev, 
  		    char *buf)						\
  {									\
@@ -36866,9 +36883,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi_sysfs.c linux-2.6.32.45/drivers/scs
  	return snprintf(buf, 20, "0x%llx\n", count);			\
  }									\
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c
---- linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c
+--- linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi_transport_fc.c	2011-05-04 17:56:28.000000000 -0400
 @@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo,
   * Netlink Infrastructure
   */
@@ -36896,9 +36913,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c linux-2.6.32.45/driv
  
  	error = transport_class_register(&fc_host_class);
  	if (error)
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c
---- linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c
+--- linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi_transport_iscsi.c	2011-05-04 17:56:28.000000000 -0400
 @@ -81,7 +81,7 @@ struct iscsi_internal {
  	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -36926,9 +36943,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c linux-2.6.32.45/d
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c
---- linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c
+--- linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/scsi_transport_srp.c	2011-05-04 17:56:28.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -36956,9 +36973,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c linux-2.6.32.45/dri
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff -urNp linux-2.6.32.45/drivers/scsi/sg.c linux-2.6.32.45/drivers/scsi/sg.c
---- linux-2.6.32.45/drivers/scsi/sg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/sg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/sg.c linux-2.6.32.46/drivers/scsi/sg.c
+--- linux-2.6.32.46/drivers/scsi/sg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/sg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
@@ -36977,9 +36994,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/sg.c linux-2.6.32.45/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1754,6 +1754,8 @@ static int __devinit sym2_probe(struct p
  	int do_iounmap = 0;
  	int do_disable_device = 1;
@@ -36989,9 +37006,9 @@ diff -urNp linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6.32.45/d
  	memset(&sym_dev, 0, sizeof(sym_dev));
  	memset(&nvram, 0, sizeof(nvram));
  	sym_dev.pdev = pdev;
-diff -urNp linux-2.6.32.45/drivers/serial/kgdboc.c linux-2.6.32.45/drivers/serial/kgdboc.c
---- linux-2.6.32.45/drivers/serial/kgdboc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/serial/kgdboc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/serial/kgdboc.c linux-2.6.32.46/drivers/serial/kgdboc.c
+--- linux-2.6.32.46/drivers/serial/kgdboc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/serial/kgdboc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,7 +18,7 @@
  
  #define MAX_CONFIG_LEN		40
@@ -37010,9 +37027,9 @@ diff -urNp linux-2.6.32.45/drivers/serial/kgdboc.c linux-2.6.32.45/drivers/seria
  	.name			= "kgdboc",
  	.read_char		= kgdboc_get_char,
  	.write_char		= kgdboc_put_char,
-diff -urNp linux-2.6.32.45/drivers/spi/spi.c linux-2.6.32.45/drivers/spi/spi.c
---- linux-2.6.32.45/drivers/spi/spi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/spi/spi.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/spi/spi.c linux-2.6.32.46/drivers/spi/spi.c
+--- linux-2.6.32.46/drivers/spi/spi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/spi/spi.c	2011-05-04 17:56:28.000000000 -0400
 @@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, str
  EXPORT_SYMBOL_GPL(spi_sync);
  
@@ -37022,9 +37039,9 @@ diff -urNp linux-2.6.32.45/drivers/spi/spi.c linux-2.6.32.45/drivers/spi/spi.c
  
  static u8	*buf;
  
-diff -urNp linux-2.6.32.45/drivers/staging/android/binder.c linux-2.6.32.45/drivers/staging/android/binder.c
---- linux-2.6.32.45/drivers/staging/android/binder.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/android/binder.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/android/binder.c linux-2.6.32.46/drivers/staging/android/binder.c
+--- linux-2.6.32.46/drivers/staging/android/binder.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/android/binder.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
  	binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
  }
@@ -37034,9 +37051,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/android/binder.c linux-2.6.32.45/driv
  	.open = binder_vma_open,
  	.close = binder_vma_close,
  };
-diff -urNp linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c
+--- linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/b3dfg/b3dfg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
  	return VM_FAULT_NOPAGE;
  }
@@ -37055,9 +37072,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.45/drivers
  	.owner = THIS_MODULE,
  	.open = b3dfg_open,
  	.release = b3dfg_release,
-diff -urNp linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c	2011-08-09 18:35:29.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c	2011-08-09 18:34:00.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c	2011-08-09 18:35:29.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/comedi/comedi_fops.c	2011-08-09 18:34:00.000000000 -0400
 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 
  	mutex_unlock(&dev->mutex);
  }
@@ -37067,9 +37084,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c linux-2.6.32.45/
  	.close = comedi_unmap,
  };
  
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/adsp_driver.c	2011-04-17 15:56:46.000000000 -0400
 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
  static dev_t adsp_devno;
  static struct class *adsp_class;
@@ -37079,9 +37096,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = adsp_open,
  	.unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_aac.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1022,7 +1022,7 @@ done:
  	return rc;
  }
@@ -37091,9 +37108,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
  	.owner = THIS_MODULE,
  	.open = audio_open,
  	.release = audio_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_amrnb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -833,7 +833,7 @@ done:
  	return rc;
  }
@@ -37103,9 +37120,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = audamrnb_open,
  	.release = audamrnb_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_evrc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -805,7 +805,7 @@ dma_fail:
  	return rc;
  }
@@ -37115,9 +37132,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
  	.owner = THIS_MODULE,
  	.open = audevrc_open,
  	.release = audevrc_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_in.c	2011-04-17 15:56:46.000000000 -0400
 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
  	return 0;
  }
@@ -37136,9 +37153,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.4
  	.owner          = THIS_MODULE,
  	.open           = audpre_open,
  	.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_mp3.c	2011-04-17 15:56:46.000000000 -0400
 @@ -941,7 +941,7 @@ done:
  	return rc;
  }
@@ -37148,9 +37165,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audio_open,
  	.release	= audio_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_out.c	2011-04-17 15:56:46.000000000 -0400
 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
  	return 0;
  }
@@ -37169,9 +37186,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
  	.owner		= THIS_MODULE,
  	.open		= audpp_open,
  	.unlocked_ioctl	= audpp_ioctl,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/audio_qcelp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -816,7 +816,7 @@ err:
  	return rc;
  }
@@ -37181,9 +37198,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
  	.owner = THIS_MODULE,
  	.open = audqcelp_open,
  	.release = audqcelp_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/qdsp5/snd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -242,7 +242,7 @@ err:
  	return rc;
  }
@@ -37193,9 +37210,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.45/dri
  	.owner		= THIS_MODULE,
  	.open		= snd_open,
  	.release	= snd_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c
+--- linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/smd/smd_qmi.c	2011-04-17 15:56:46.000000000 -0400
 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
  	return 0;
  }
@@ -37205,9 +37222,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.45/d
  	.owner = THIS_MODULE,
  	.read = qmi_read,
  	.write = qmi_write,
-diff -urNp linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c
+--- linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dream/smd/smd_rpcrouter_device.c	2011-04-17 15:56:46.000000000 -0400
 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 
  	return rc;
  }
@@ -37226,9 +37243,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
  	.owner	 = THIS_MODULE,
  	.open	 = rpcrouter_open,
  	.release = rpcrouter_release,
-diff -urNp linux-2.6.32.45/drivers/staging/dst/dcore.c linux-2.6.32.45/drivers/staging/dst/dcore.c
---- linux-2.6.32.45/drivers/staging/dst/dcore.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dst/dcore.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dst/dcore.c linux-2.6.32.46/drivers/staging/dst/dcore.c
+--- linux-2.6.32.46/drivers/staging/dst/dcore.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dst/dcore.c	2011-04-17 15:56:46.000000000 -0400
 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
  	return 0;
  }
@@ -37247,9 +37264,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dst/dcore.c linux-2.6.32.45/drivers/s
  	snprintf(n->name, sizeof(n->name), "%s", ctl->name);
  
  	err = dst_node_sysfs_init(n);
-diff -urNp linux-2.6.32.45/drivers/staging/dst/trans.c linux-2.6.32.45/drivers/staging/dst/trans.c
---- linux-2.6.32.45/drivers/staging/dst/trans.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/dst/trans.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/dst/trans.c linux-2.6.32.46/drivers/staging/dst/trans.c
+--- linux-2.6.32.46/drivers/staging/dst/trans.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/dst/trans.c	2011-04-17 15:56:46.000000000 -0400
 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 
  	t->error = 0;
  	t->retries = 0;
@@ -37259,9 +37276,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/dst/trans.c linux-2.6.32.45/drivers/s
  
  	t->enc = bio_data_dir(bio);
  	dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
-diff -urNp linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c
---- linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c
+--- linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/et131x/et1310_tx.c	2011-05-04 17:56:28.000000000 -0400
 @@ -710,11 +710,11 @@ inline void et131x_free_send_packet(stru
  	struct net_device_stats *stats = &etdev->net_stats;
  
@@ -37277,9 +37294,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c linux-2.6.32.45/dr
  
  	if (pMpTcb->Packet) {
  		stats->tx_bytes += pMpTcb->Packet->len;
-diff -urNp linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h
---- linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h
+--- linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/et131x/et131x_adapter.h	2011-05-04 17:56:28.000000000 -0400
 @@ -145,11 +145,11 @@ typedef struct _ce_stats_t {
  	 * operations
  	 */
@@ -37295,9 +37312,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h linux-2.6.32.
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff -urNp linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
  	return 0;
  }
@@ -37307,9 +37324,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.45/
  	.open	= go7007_vm_open,
  	.close	= go7007_vm_close,
  	.fault	= go7007_vm_fault,
-diff -urNp linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
  /* The one and only one */
  static struct blkvsc_driver_context g_blkvsc_drv;
@@ -37319,9 +37336,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.45/drive
  	.owner = THIS_MODULE,
  	.open = blkvsc_open,
  	.release = blkvsc_release,
-diff -urNp linux-2.6.32.45/drivers/staging/hv/Channel.c linux-2.6.32.45/drivers/staging/hv/Channel.c
---- linux-2.6.32.45/drivers/staging/hv/Channel.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/hv/Channel.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/hv/Channel.c linux-2.6.32.46/drivers/staging/hv/Channel.c
+--- linux-2.6.32.46/drivers/staging/hv/Channel.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/Channel.c	2011-05-04 17:56:28.000000000 -0400
 @@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vm
  
  	DPRINT_ENTER(VMBUS);
@@ -37333,9 +37350,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/hv/Channel.c linux-2.6.32.45/drivers/
  
  	VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount);
  	ASSERT(msgInfo != NULL);
-diff -urNp linux-2.6.32.45/drivers/staging/hv/Hv.c linux-2.6.32.45/drivers/staging/hv/Hv.c
---- linux-2.6.32.45/drivers/staging/hv/Hv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/hv/Hv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/hv/Hv.c linux-2.6.32.46/drivers/staging/hv/Hv.c
+--- linux-2.6.32.46/drivers/staging/hv/Hv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/Hv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
  	u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
  	u32 outputAddressHi = outputAddress >> 32;
@@ -37345,9 +37362,21 @@ diff -urNp linux-2.6.32.45/drivers/staging/hv/Hv.c linux-2.6.32.45/drivers/stagi
  
  	DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
  		   Control, Input, Output);
-diff -urNp linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c
---- linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusApi.h linux-2.6.32.46/drivers/staging/hv/VmbusApi.h
+--- linux-2.6.32.46/drivers/staging/hv/VmbusApi.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/VmbusApi.h	2011-08-29 22:32:57.000000000 -0400
+@@ -109,7 +109,7 @@ struct vmbus_channel_interface {
+ 			      u32 *GpadlHandle);
+ 	int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle);
+ 	void (*GetInfo)(struct hv_device *dev, struct hv_device_info *devinfo);
+-};
++} __no_const;
+ 
+ /* Base driver object */
+ struct hv_driver {
+diff -urNp linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c
+--- linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c	2011-05-04 17:56:28.000000000 -0400
 @@ -532,7 +532,7 @@ static int vmbus_child_device_register(s
  				to_device_context(root_device_obj);
  	struct device_context *child_device_ctx =
@@ -37366,9 +37395,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c linux-2.6.32.45/driver
  
  	/* The new device belongs to this bus */
  	child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
-diff -urNp linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h
---- linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h
+--- linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h	2011-05-04 17:56:28.000000000 -0400
 @@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
  struct VMBUS_CONNECTION {
  	enum VMBUS_CONNECT_STATE ConnectState;
@@ -37378,9 +37407,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.45/dri
  
  	/*
  	 * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-2.6.32.45/drivers/staging/iio/ring_generic.h linux-2.6.32.45/drivers/staging/iio/ring_generic.h
---- linux-2.6.32.45/drivers/staging/iio/ring_generic.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/iio/ring_generic.h	2011-08-23 20:24:26.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/iio/ring_generic.h linux-2.6.32.46/drivers/staging/iio/ring_generic.h
+--- linux-2.6.32.46/drivers/staging/iio/ring_generic.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/iio/ring_generic.h	2011-08-23 20:24:26.000000000 -0400
 @@ -87,7 +87,7 @@ struct iio_ring_access_funcs {
  
  	int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -37390,9 +37419,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/iio/ring_generic.h linux-2.6.32.45/dr
  
  /**
   * struct iio_ring_buffer - general ring buffer structure
-diff -urNp linux-2.6.32.45/drivers/staging/octeon/ethernet.c linux-2.6.32.45/drivers/staging/octeon/ethernet.c
---- linux-2.6.32.45/drivers/staging/octeon/ethernet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/octeon/ethernet.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet.c linux-2.6.32.46/drivers/staging/octeon/ethernet.c
+--- linux-2.6.32.46/drivers/staging/octeon/ethernet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/octeon/ethernet.c	2011-05-04 17:56:28.000000000 -0400
 @@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_
  		 * since the RX tasklet also increments it.
  		 */
@@ -37409,9 +37438,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/octeon/ethernet.c linux-2.6.32.45/dri
  #endif
  	}
  
-diff -urNp linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c
---- linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c
+--- linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c	2011-05-04 17:56:28.000000000 -0400
 @@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long un
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -37440,9 +37469,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.45/
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff -urNp linux-2.6.32.45/drivers/staging/panel/panel.c linux-2.6.32.45/drivers/staging/panel/panel.c
---- linux-2.6.32.45/drivers/staging/panel/panel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/panel/panel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/panel/panel.c linux-2.6.32.46/drivers/staging/panel/panel.c
+--- linux-2.6.32.46/drivers/staging/panel/panel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/panel/panel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
  	return 0;
  }
@@ -37461,9 +37490,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/panel/panel.c linux-2.6.32.45/drivers
  	.read    = keypad_read,		/* read */
  	.open    = keypad_open,		/* open */
  	.release = keypad_release,	/* close */
-diff -urNp linux-2.6.32.45/drivers/staging/phison/phison.c linux-2.6.32.45/drivers/staging/phison/phison.c
---- linux-2.6.32.45/drivers/staging/phison/phison.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/phison/phison.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/phison/phison.c linux-2.6.32.46/drivers/staging/phison/phison.c
+--- linux-2.6.32.46/drivers/staging/phison/phison.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/phison/phison.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_
  	ATA_BMDMA_SHT(DRV_NAME),
  };
@@ -37473,9 +37502,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/phison/phison.c linux-2.6.32.45/drive
  	.inherits		= &ata_bmdma_port_ops,
  	.prereset		= phison_pre_reset,
  };
-diff -urNp linux-2.6.32.45/drivers/staging/poch/poch.c linux-2.6.32.45/drivers/staging/poch/poch.c
---- linux-2.6.32.45/drivers/staging/poch/poch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/poch/poch.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/poch/poch.c linux-2.6.32.46/drivers/staging/poch/poch.c
+--- linux-2.6.32.46/drivers/staging/poch/poch.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/poch/poch.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
  	return 0;
  }
@@ -37485,9 +37514,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/poch/poch.c linux-2.6.32.45/drivers/s
  	.owner = THIS_MODULE,
  	.open = poch_open,
  	.release = poch_release,
-diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/inode.c linux-2.6.32.45/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.45/drivers/staging/pohmelfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/pohmelfs/inode.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/inode.c linux-2.6.32.46/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.32.46/drivers/staging/pohmelfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/pohmelfs/inode.c	2011-05-04 17:56:20.000000000 -0400
 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
@@ -37506,9 +37535,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/inode.c linux-2.6.32.45/driv
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/pohmelfs/mcache.c	2011-04-17 15:56:46.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
@@ -37518,9 +37547,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c linux-2.6.32.45/dri
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/pohmelfs/netfs.h	2011-05-04 17:56:20.000000000 -0400
 @@ -570,14 +570,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
@@ -37538,9 +37567,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h linux-2.6.32.45/driv
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/trans.c linux-2.6.32.45/drivers/staging/pohmelfs/trans.c
---- linux-2.6.32.45/drivers/staging/pohmelfs/trans.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/pohmelfs/trans.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/pohmelfs/trans.c linux-2.6.32.46/drivers/staging/pohmelfs/trans.c
+--- linux-2.6.32.46/drivers/staging/pohmelfs/trans.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/pohmelfs/trans.c	2011-05-04 17:56:28.000000000 -0400
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
  	int err;
  	struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -37550,9 +37579,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/trans.c linux-2.6.32.45/driv
  
  	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
  		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-2.6.32.45/drivers/staging/sep/sep_driver.c linux-2.6.32.45/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.45/drivers/staging/sep/sep_driver.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/sep/sep_driver.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/sep/sep_driver.c linux-2.6.32.46/drivers/staging/sep/sep_driver.c
+--- linux-2.6.32.46/drivers/staging/sep/sep_driver.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/sep/sep_driver.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 
  static dev_t sep_devno;
  
@@ -37562,9 +37591,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/sep/sep_driver.c linux-2.6.32.45/driv
  	.owner = THIS_MODULE,
  	.ioctl = sep_ioctl,
  	.poll = sep_poll,
-diff -urNp linux-2.6.32.45/drivers/staging/usbip/usbip_common.h linux-2.6.32.45/drivers/staging/usbip/usbip_common.h
---- linux-2.6.32.45/drivers/staging/usbip/usbip_common.h	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/usbip/usbip_common.h	2011-08-23 20:24:26.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/usbip/usbip_common.h linux-2.6.32.46/drivers/staging/usbip/usbip_common.h
+--- linux-2.6.32.46/drivers/staging/usbip/usbip_common.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/usbip/usbip_common.h	2011-08-23 20:24:26.000000000 -0400
 @@ -374,7 +374,7 @@ struct usbip_device {
  		void (*shutdown)(struct usbip_device *);
  		void (*reset)(struct usbip_device *);
@@ -37574,9 +37603,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/usbip/usbip_common.h linux-2.6.32.45/
  };
  
  
-diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci.h linux-2.6.32.45/drivers/staging/usbip/vhci.h
---- linux-2.6.32.45/drivers/staging/usbip/vhci.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/usbip/vhci.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci.h linux-2.6.32.46/drivers/staging/usbip/vhci.h
+--- linux-2.6.32.46/drivers/staging/usbip/vhci.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/usbip/vhci.h	2011-05-04 17:56:28.000000000 -0400
 @@ -92,7 +92,7 @@ struct vhci_hcd {
  	unsigned	resuming:1;
  	unsigned long	re_timeout;
@@ -37586,9 +37615,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci.h linux-2.6.32.45/drivers/
  
  	/*
  	 * NOTE:
-diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c
---- linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:12:33.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c
+--- linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/usbip/vhci_hcd.c	2011-05-10 22:12:33.000000000 -0400
 @@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb)
  		return;
  	}
@@ -37616,9 +37645,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c linux-2.6.32.45/driv
  	spin_lock_init(&vhci->lock);
  
  
-diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c
---- linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c
+--- linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/usbip/vhci_rx.c	2011-05-04 17:56:28.000000000 -0400
 @@ -78,7 +78,7 @@ static void vhci_recv_ret_submit(struct 
  		usbip_uerr("cannot find a urb of seqnum %u\n",
  							pdu->base.seqnum);
@@ -37628,9 +37657,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c linux-2.6.32.45/drive
  		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
  		return;
  	}
-diff -urNp linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/vme/devices/vme_user.c	2011-04-17 15:56:46.000000000 -0400
 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
  static int __init vme_user_probe(struct device *, int, int);
  static int __exit vme_user_remove(struct device *, int, int);
@@ -37640,9 +37669,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c linux-2.6.32.4
          .open = vme_user_open,
          .release = vme_user_release,
          .read = vme_user_read,
-diff -urNp linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c	2011-08-23 20:24:26.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/wlan-ng/hfa384x_usb.c	2011-08-23 20:24:26.000000000 -0400
 @@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hf
  
  struct usbctlx_completor {
@@ -37652,9 +37681,9 @@ diff -urNp linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c linux-2.6.32.45
  typedef struct usbctlx_completor usbctlx_completor_t;
  
  static int
-diff -urNp linux-2.6.32.45/drivers/telephony/ixj.c linux-2.6.32.45/drivers/telephony/ixj.c
---- linux-2.6.32.45/drivers/telephony/ixj.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/telephony/ixj.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/telephony/ixj.c linux-2.6.32.46/drivers/telephony/ixj.c
+--- linux-2.6.32.46/drivers/telephony/ixj.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/telephony/ixj.c	2011-05-16 21:46:57.000000000 -0400
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
  	bool mContinue;
  	char *pIn, *pOut;
@@ -37664,9 +37693,9 @@ diff -urNp linux-2.6.32.45/drivers/telephony/ixj.c linux-2.6.32.45/drivers/telep
  	if (!SCI_Prepare(j))
  		return 0;
  
-diff -urNp linux-2.6.32.45/drivers/uio/uio.c linux-2.6.32.45/drivers/uio/uio.c
---- linux-2.6.32.45/drivers/uio/uio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/uio/uio.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/uio/uio.c linux-2.6.32.46/drivers/uio/uio.c
+--- linux-2.6.32.46/drivers/uio/uio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/uio/uio.c	2011-05-04 17:56:20.000000000 -0400
 @@ -23,6 +23,7 @@
  #include <linux/string.h>
  #include <linux/kobject.h>
@@ -37776,9 +37805,9 @@ diff -urNp linux-2.6.32.45/drivers/uio/uio.c linux-2.6.32.45/drivers/uio/uio.c
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff -urNp linux-2.6.32.45/drivers/usb/atm/usbatm.c linux-2.6.32.45/drivers/usb/atm/usbatm.c
---- linux-2.6.32.45/drivers/usb/atm/usbatm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/atm/usbatm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/atm/usbatm.c linux-2.6.32.46/drivers/usb/atm/usbatm.c
+--- linux-2.6.32.46/drivers/usb/atm/usbatm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/atm/usbatm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
  		if (printk_ratelimit())
  			atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -37858,9 +37887,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/atm/usbatm.c linux-2.6.32.45/drivers/usb/
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-2.6.32.45/drivers/usb/class/cdc-wdm.c linux-2.6.32.45/drivers/usb/class/cdc-wdm.c
---- linux-2.6.32.45/drivers/usb/class/cdc-wdm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/class/cdc-wdm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/class/cdc-wdm.c linux-2.6.32.46/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.32.46/drivers/usb/class/cdc-wdm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/class/cdc-wdm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -314,7 +314,7 @@ static ssize_t wdm_write
  	if (r < 0)
  		goto outnp;
@@ -37870,9 +37899,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/class/cdc-wdm.c linux-2.6.32.45/drivers/u
  		r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
  								&desc->flags));
  	else
-diff -urNp linux-2.6.32.45/drivers/usb/core/hcd.c linux-2.6.32.45/drivers/usb/core/hcd.c
---- linux-2.6.32.45/drivers/usb/core/hcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/core/hcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.c linux-2.6.32.46/drivers/usb/core/hcd.c
+--- linux-2.6.32.46/drivers/usb/core/hcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/core/hcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
  
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -37891,9 +37920,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/core/hcd.c linux-2.6.32.45/drivers/usb/co
  {
  
  	if (mon_ops)
-diff -urNp linux-2.6.32.45/drivers/usb/core/hcd.h linux-2.6.32.45/drivers/usb/core/hcd.h
---- linux-2.6.32.45/drivers/usb/core/hcd.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/core/hcd.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/core/hcd.h linux-2.6.32.46/drivers/usb/core/hcd.h
+--- linux-2.6.32.46/drivers/usb/core/hcd.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/core/hcd.h	2011-04-17 15:56:46.000000000 -0400
 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
  #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
  
@@ -37921,9 +37950,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/core/hcd.h linux-2.6.32.45/drivers/usb/co
  void usb_mon_deregister(void);
  
  #else
-diff -urNp linux-2.6.32.45/drivers/usb/core/message.c linux-2.6.32.45/drivers/usb/core/message.c
---- linux-2.6.32.45/drivers/usb/core/message.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/core/message.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/core/message.c linux-2.6.32.46/drivers/usb/core/message.c
+--- linux-2.6.32.46/drivers/usb/core/message.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/core/message.c	2011-04-17 15:56:46.000000000 -0400
 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
@@ -37935,9 +37964,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/core/message.c linux-2.6.32.45/drivers/us
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.32.45/drivers/usb/misc/appledisplay.c linux-2.6.32.45/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.45/drivers/usb/misc/appledisplay.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/misc/appledisplay.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/misc/appledisplay.c linux-2.6.32.46/drivers/usb/misc/appledisplay.c
+--- linux-2.6.32.46/drivers/usb/misc/appledisplay.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/misc/appledisplay.c	2011-04-17 15:56:46.000000000 -0400
 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
  		return pdata->msgdata[1];
  }
@@ -37947,9 +37976,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/misc/appledisplay.c linux-2.6.32.45/drive
  	.get_brightness	= appledisplay_bl_get_brightness,
  	.update_status	= appledisplay_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/usb/mon/mon_main.c linux-2.6.32.45/drivers/usb/mon/mon_main.c
---- linux-2.6.32.45/drivers/usb/mon/mon_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/mon/mon_main.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/mon/mon_main.c linux-2.6.32.46/drivers/usb/mon/mon_main.c
+--- linux-2.6.32.46/drivers/usb/mon/mon_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/mon/mon_main.c	2011-04-17 15:56:46.000000000 -0400
 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
  /*
   * Ops
@@ -37959,9 +37988,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/mon/mon_main.c linux-2.6.32.45/drivers/us
  	.urb_submit =	mon_submit,
  	.urb_submit_error = mon_submit_error,
  	.urb_complete =	mon_complete,
-diff -urNp linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h
---- linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h
+--- linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/wusbcore/wa-hc.h	2011-05-04 17:56:28.000000000 -0400
 @@ -192,7 +192,7 @@ struct wahc {
  	struct list_head xfer_delayed_list;
  	spinlock_t xfer_list_lock;
@@ -37980,9 +38009,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.45/drivers/
  }
  
  /**
-diff -urNp linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c
---- linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c
+--- linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/usb/wusbcore/wa-xfer.c	2011-05-04 17:56:28.000000000 -0400
 @@ -293,7 +293,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -37992,9 +38021,9 @@ diff -urNp linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.45/driver
  }
  
  /*
-diff -urNp linux-2.6.32.45/drivers/uwb/wlp/messages.c linux-2.6.32.45/drivers/uwb/wlp/messages.c
---- linux-2.6.32.45/drivers/uwb/wlp/messages.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/uwb/wlp/messages.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/uwb/wlp/messages.c linux-2.6.32.46/drivers/uwb/wlp/messages.c
+--- linux-2.6.32.46/drivers/uwb/wlp/messages.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/uwb/wlp/messages.c	2011-04-17 15:56:46.000000000 -0400
 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
  	size_t len = skb->len;
  	size_t used;
@@ -38004,9 +38033,9 @@ diff -urNp linux-2.6.32.45/drivers/uwb/wlp/messages.c linux-2.6.32.45/drivers/uw
  	enum wlp_assc_error assc_err;
  	char enonce_buf[WLP_WSS_NONCE_STRSIZE];
  	char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.32.45/drivers/uwb/wlp/sysfs.c linux-2.6.32.45/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.45/drivers/uwb/wlp/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/uwb/wlp/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/uwb/wlp/sysfs.c linux-2.6.32.46/drivers/uwb/wlp/sysfs.c
+--- linux-2.6.32.46/drivers/uwb/wlp/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/uwb/wlp/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
  	return ret;
  }
@@ -38017,9 +38046,9 @@ diff -urNp linux-2.6.32.45/drivers/uwb/wlp/sysfs.c linux-2.6.32.45/drivers/uwb/w
  	.show	= wlp_wss_attr_show,
  	.store	= wlp_wss_attr_store,
  };
-diff -urNp linux-2.6.32.45/drivers/video/atmel_lcdfb.c linux-2.6.32.45/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.45/drivers/video/atmel_lcdfb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/atmel_lcdfb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/atmel_lcdfb.c linux-2.6.32.46/drivers/video/atmel_lcdfb.c
+--- linux-2.6.32.46/drivers/video/atmel_lcdfb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/atmel_lcdfb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
  	return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
  }
@@ -38029,9 +38058,9 @@ diff -urNp linux-2.6.32.45/drivers/video/atmel_lcdfb.c linux-2.6.32.45/drivers/v
  	.update_status = atmel_bl_update_status,
  	.get_brightness = atmel_bl_get_brightness,
  };
-diff -urNp linux-2.6.32.45/drivers/video/aty/aty128fb.c linux-2.6.32.45/drivers/video/aty/aty128fb.c
---- linux-2.6.32.45/drivers/video/aty/aty128fb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/aty/aty128fb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/aty/aty128fb.c linux-2.6.32.46/drivers/video/aty/aty128fb.c
+--- linux-2.6.32.46/drivers/video/aty/aty128fb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/aty/aty128fb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
  	return bd->props.brightness;
  }
@@ -38041,9 +38070,9 @@ diff -urNp linux-2.6.32.45/drivers/video/aty/aty128fb.c linux-2.6.32.45/drivers/
  	.get_brightness	= aty128_bl_get_brightness,
  	.update_status	= aty128_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/aty/atyfb_base.c linux-2.6.32.45/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.45/drivers/video/aty/atyfb_base.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/aty/atyfb_base.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/aty/atyfb_base.c linux-2.6.32.46/drivers/video/aty/atyfb_base.c
+--- linux-2.6.32.46/drivers/video/aty/atyfb_base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/aty/atyfb_base.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 
  	return bd->props.brightness;
  }
@@ -38053,9 +38082,9 @@ diff -urNp linux-2.6.32.45/drivers/video/aty/atyfb_base.c linux-2.6.32.45/driver
  	.get_brightness = aty_bl_get_brightness,
  	.update_status	= aty_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/aty/radeon_backlight.c linux-2.6.32.45/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.45/drivers/video/aty/radeon_backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/aty/radeon_backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/aty/radeon_backlight.c linux-2.6.32.46/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.32.46/drivers/video/aty/radeon_backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/aty/radeon_backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
  	return bd->props.brightness;
  }
@@ -38065,9 +38094,9 @@ diff -urNp linux-2.6.32.45/drivers/video/aty/radeon_backlight.c linux-2.6.32.45/
  	.get_brightness = radeon_bl_get_brightness,
  	.update_status	= radeon_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/adp5520_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
  	return error ? data->current_brightness : reg_val;
  }
@@ -38077,9 +38106,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c linux-2.6.32.45/
  	.update_status	= adp5520_bl_update_status,
  	.get_brightness	= adp5520_bl_get_brightness,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/adx_bl.c linux-2.6.32.45/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.45/drivers/video/backlight/adx_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/adx_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/adx_bl.c linux-2.6.32.46/drivers/video/backlight/adx_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/adx_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/adx_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
  	return 1;
  }
@@ -38089,9 +38118,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/adx_bl.c linux-2.6.32.45/driv
  	.options = 0,
  	.update_status = adx_backlight_update_status,
  	.get_brightness = adx_backlight_get_brightness,
-diff -urNp linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c
+--- linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/atmel-pwm-bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 
  	return pwm_channel_enable(&pwmbl->pwmc);
  }
@@ -38101,9 +38130,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.4
  	.get_brightness = atmel_pwm_bl_get_intensity,
  	.update_status  = atmel_pwm_bl_set_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/backlight.c linux-2.6.32.45/drivers/video/backlight/backlight.c
---- linux-2.6.32.45/drivers/video/backlight/backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/backlight.c linux-2.6.32.46/drivers/video/backlight/backlight.c
+--- linux-2.6.32.46/drivers/video/backlight/backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
   * ERR_PTR() or a pointer to the newly allocated device.
   */
@@ -38113,9 +38142,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/backlight.c linux-2.6.32.45/d
  {
  	struct backlight_device *new_bd;
  	int rc;
-diff -urNp linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c
+--- linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/corgi_lcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
  }
  EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -38125,9 +38154,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c linux-2.6.32.45/d
  	.get_brightness	= corgi_bl_get_intensity,
  	.update_status  = corgi_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c
+--- linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/cr_bllcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
  	return intensity;
  }
@@ -38137,9 +38166,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c linux-2.6.32.45/dr
  	.get_brightness = cr_backlight_get_intensity,
  	.update_status = cr_backlight_set_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/da903x_bl.c linux-2.6.32.45/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.45/drivers/video/backlight/da903x_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/da903x_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/da903x_bl.c linux-2.6.32.46/drivers/video/backlight/da903x_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/da903x_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/da903x_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
  	return data->current_brightness;
  }
@@ -38149,9 +38178,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/da903x_bl.c linux-2.6.32.45/d
  	.update_status	= da903x_backlight_update_status,
  	.get_brightness	= da903x_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/generic_bl.c linux-2.6.32.45/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.45/drivers/video/backlight/generic_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/generic_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/generic_bl.c linux-2.6.32.46/drivers/video/backlight/generic_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/generic_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/generic_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
  }
  EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -38161,9 +38190,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/generic_bl.c linux-2.6.32.45/
  	.options = BL_CORE_SUSPENDRESUME,
  	.get_brightness = genericbl_get_intensity,
  	.update_status  = genericbl_send_intensity,
-diff -urNp linux-2.6.32.45/drivers/video/backlight/hp680_bl.c linux-2.6.32.45/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.45/drivers/video/backlight/hp680_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/hp680_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/hp680_bl.c linux-2.6.32.46/drivers/video/backlight/hp680_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/hp680_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/hp680_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 
  	return current_intensity;
  }
@@ -38173,9 +38202,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/hp680_bl.c linux-2.6.32.45/dr
  	.get_brightness = hp680bl_get_intensity,
  	.update_status  = hp680bl_set_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/jornada720_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -93,7 +93,7 @@ out:
  	return ret;
  }
@@ -38185,9 +38214,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
  	.get_brightness = jornada_bl_get_brightness,
  	.update_status = jornada_bl_update_status,
  	.options = BL_CORE_SUSPENDRESUME,
-diff -urNp linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/kb3886_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
  	return kb3886bl_intensity;
  }
@@ -38197,9 +38226,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c linux-2.6.32.45/d
  	.get_brightness = kb3886bl_get_intensity,
  	.update_status  = kb3886bl_send_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/locomolcd.c linux-2.6.32.45/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.45/drivers/video/backlight/locomolcd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/locomolcd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/locomolcd.c linux-2.6.32.46/drivers/video/backlight/locomolcd.c
+--- linux-2.6.32.46/drivers/video/backlight/locomolcd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/locomolcd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
  	return current_intensity;
  }
@@ -38209,9 +38238,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/locomolcd.c linux-2.6.32.45/d
  	.get_brightness = locomolcd_get_intensity,
  	.update_status  = locomolcd_set_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c	2011-05-10 22:12:33.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/mbp_nvidia_bl.c	2011-05-10 22:12:33.000000000 -0400
 @@ -33,7 +33,7 @@ struct dmi_match_data {
  	unsigned long iostart;
  	unsigned long iolen;
@@ -38221,9 +38250,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
  };
  
  /* Module parameters. */
-diff -urNp linux-2.6.32.45/drivers/video/backlight/omap1_bl.c linux-2.6.32.45/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.45/drivers/video/backlight/omap1_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/omap1_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/omap1_bl.c linux-2.6.32.46/drivers/video/backlight/omap1_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/omap1_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/omap1_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
  	return bl->current_intensity;
  }
@@ -38233,9 +38262,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/omap1_bl.c linux-2.6.32.45/dr
  	.get_brightness = omapbl_get_intensity,
  	.update_status  = omapbl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/progear_bl.c linux-2.6.32.45/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.45/drivers/video/backlight/progear_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/progear_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/progear_bl.c linux-2.6.32.46/drivers/video/backlight/progear_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/progear_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/progear_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
  	return intensity - HW_LEVEL_MIN;
  }
@@ -38245,9 +38274,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/progear_bl.c linux-2.6.32.45/
  	.get_brightness = progearbl_get_intensity,
  	.update_status = progearbl_set_intensity,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/pwm_bl.c linux-2.6.32.45/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.45/drivers/video/backlight/pwm_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/pwm_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/pwm_bl.c linux-2.6.32.46/drivers/video/backlight/pwm_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/pwm_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/pwm_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
  	return bl->props.brightness;
  }
@@ -38257,9 +38286,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/pwm_bl.c linux-2.6.32.45/driv
  	.update_status	= pwm_backlight_update_status,
  	.get_brightness	= pwm_backlight_get_brightness,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/tosa_bl.c linux-2.6.32.45/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.45/drivers/video/backlight/tosa_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/tosa_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/tosa_bl.c linux-2.6.32.46/drivers/video/backlight/tosa_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/tosa_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/tosa_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
  	return props->brightness;
  }
@@ -38269,9 +38298,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/tosa_bl.c linux-2.6.32.45/dri
  	.get_brightness		= tosa_bl_get_brightness,
  	.update_status		= tosa_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c
+--- linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/backlight/wm831x_bl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
  	return data->current_brightness;
  }
@@ -38281,9 +38310,9 @@ diff -urNp linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c linux-2.6.32.45/d
  	.options = BL_CORE_SUSPENDRESUME,
  	.update_status	= wm831x_backlight_update_status,
  	.get_brightness	= wm831x_backlight_get_brightness,
-diff -urNp linux-2.6.32.45/drivers/video/bf54x-lq043fb.c linux-2.6.32.45/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.45/drivers/video/bf54x-lq043fb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/bf54x-lq043fb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/bf54x-lq043fb.c linux-2.6.32.46/drivers/video/bf54x-lq043fb.c
+--- linux-2.6.32.46/drivers/video/bf54x-lq043fb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/bf54x-lq043fb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
  	return 0;
  }
@@ -38293,9 +38322,9 @@ diff -urNp linux-2.6.32.45/drivers/video/bf54x-lq043fb.c linux-2.6.32.45/drivers
  	.get_brightness = bl_get_brightness,
  };
  
-diff -urNp linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c
+--- linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/bfin-t350mcqb-fb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
  	return 0;
  }
@@ -38305,9 +38334,9 @@ diff -urNp linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.45/driv
  	.get_brightness = bl_get_brightness,
  };
  
-diff -urNp linux-2.6.32.45/drivers/video/fbcmap.c linux-2.6.32.45/drivers/video/fbcmap.c
---- linux-2.6.32.45/drivers/video/fbcmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/fbcmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/fbcmap.c linux-2.6.32.46/drivers/video/fbcmap.c
+--- linux-2.6.32.46/drivers/video/fbcmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/fbcmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
@@ -38318,9 +38347,9 @@ diff -urNp linux-2.6.32.45/drivers/video/fbcmap.c linux-2.6.32.45/drivers/video/
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-2.6.32.45/drivers/video/fbmem.c linux-2.6.32.45/drivers/video/fbmem.c
---- linux-2.6.32.45/drivers/video/fbmem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/fbmem.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/fbmem.c linux-2.6.32.46/drivers/video/fbmem.c
+--- linux-2.6.32.46/drivers/video/fbmem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/fbmem.c	2011-05-16 21:46:57.000000000 -0400
 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
@@ -38366,9 +38395,9 @@ diff -urNp linux-2.6.32.45/drivers/video/fbmem.c linux-2.6.32.45/drivers/video/f
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.32.45/drivers/video/i810/i810_accel.c linux-2.6.32.45/drivers/video/i810/i810_accel.c
---- linux-2.6.32.45/drivers/video/i810/i810_accel.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/i810/i810_accel.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/i810/i810_accel.c linux-2.6.32.46/drivers/video/i810/i810_accel.c
+--- linux-2.6.32.46/drivers/video/i810/i810_accel.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/i810/i810_accel.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
@@ -38377,9 +38406,2737 @@ diff -urNp linux-2.6.32.45/drivers/video/i810/i810_accel.c linux-2.6.32.45/drive
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/logo/logo_linux_clut224.ppm	2011-08-29 23:49:24.000000000 -0400
+@@ -1,1604 +1,1123 @@
+ P3
+-# Standard 224-color Linux logo
+ 80 80
+ 255
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6   6   6   6  10  10  10  10  10  10
+- 10  10  10   6   6   6   6   6   6   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  10  10  10  14  14  14
+- 22  22  22  26  26  26  30  30  30  34  34  34
+- 30  30  30  30  30  30  26  26  26  18  18  18
+- 14  14  14  10  10  10   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  26  26  26  42  42  42
+- 54  54  54  66  66  66  78  78  78  78  78  78
+- 78  78  78  74  74  74  66  66  66  54  54  54
+- 42  42  42  26  26  26  18  18  18  10  10  10
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 22  22  22  42  42  42  66  66  66  86  86  86
+- 66  66  66  38  38  38  38  38  38  22  22  22
+- 26  26  26  34  34  34  54  54  54  66  66  66
+- 86  86  86  70  70  70  46  46  46  26  26  26
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  26  26  26
+- 50  50  50  82  82  82  58  58  58   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  54  54  54  86  86  86  66  66  66
+- 38  38  38  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  22  22  22  50  50  50
+- 78  78  78  34  34  34   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   6   6   6  70  70  70
+- 78  78  78  46  46  46  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  42  42  42  82  82  82
+- 26  26  26   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  14  14  14
+- 46  46  46  34  34  34   6   6   6   2   2   6
+- 42  42  42  78  78  78  42  42  42  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  30  30  30  66  66  66  58  58  58
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  26  26  26
+- 86  86  86 101 101 101  46  46  46  10  10  10
+-  2   2   6  58  58  58  70  70  70  34  34  34
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  42  42  42  86  86  86  10  10  10
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  30  30  30
+- 94  94  94  94  94  94  58  58  58  26  26  26
+-  2   2   6   6   6   6  78  78  78  54  54  54
+- 22  22  22   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  62  62  62  62  62  62   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  26  26  26
+- 54  54  54  38  38  38  18  18  18  10  10  10
+-  2   2   6   2   2   6  34  34  34  82  82  82
+- 38  38  38  14  14  14   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 30  30  30  78  78  78  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 10  10  10   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  78  78  78
+- 50  50  50  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  14  14  14   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  54  54  54
+- 66  66  66  26  26  26   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  82  82  82   2   2   6   2   2   6
+-  2   2   6   6   6   6  10  10  10   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 14  14  14  10  10  10   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  18  18  18
+- 82  82  82  34  34  34  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6   2   2   6
+-  6   6   6   6   6   6  22  22  22  34  34  34
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  34  34  34
+- 10  10  10  50  50  50  22  22  22   2   2   6
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 86  86  86  42  42  42  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6   2   2   6
+- 38  38  38 116 116 116  94  94  94  22  22  22
+- 22  22  22   2   2   6   2   2   6   2   2   6
+- 14  14  14  86  86  86 138 138 138 162 162 162
+-154 154 154  38  38  38  26  26  26   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 86  86  86  46  46  46  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6  14  14  14
+-134 134 134 198 198 198 195 195 195 116 116 116
+- 10  10  10   2   2   6   2   2   6   6   6   6
+-101  98  89 187 187 187 210 210 210 218 218 218
+-214 214 214 134 134 134  14  14  14   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 86  86  86  50  50  50  18  18  18   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6  54  54  54
+-218 218 218 195 195 195 226 226 226 246 246 246
+- 58  58  58   2   2   6   2   2   6  30  30  30
+-210 210 210 253 253 253 174 174 174 123 123 123
+-221 221 221 234 234 234  74  74  74   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  82  82  82   2   2   6 106 106 106
+-170 170 170  26  26  26  86  86  86 226 226 226
+-123 123 123  10  10  10  14  14  14  46  46  46
+-231 231 231 190 190 190   6   6   6  70  70  70
+- 90  90  90 238 238 238 158 158 158   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  86  86  86   6   6   6 116 116 116
+-106 106 106   6   6   6  70  70  70 149 149 149
+-128 128 128  18  18  18  38  38  38  54  54  54
+-221 221 221 106 106 106   2   2   6  14  14  14
+- 46  46  46 190 190 190 198 198 198   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  62  62  62  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  94  94  94  14  14  14 101 101 101
+-128 128 128   2   2   6  18  18  18 116 116 116
+-118  98  46 121  92   8 121  92   8  98  78  10
+-162 162 162 106 106 106   2   2   6   2   2   6
+-  2   2   6 195 195 195 195 195 195   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  62  62  62  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   1
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  90  90  90  14  14  14  58  58  58
+-210 210 210  26  26  26  54  38   6 154 114  10
+-226 170  11 236 186  11 225 175  15 184 144  12
+-215 174  15 175 146  61  37  26   9   2   2   6
+- 70  70  70 246 246 246 138 138 138   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  66  66  66  26  26  26   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  14  14  14  10  10  10
+-195 195 195 188 164 115 192 133   9 225 175  15
+-239 182  13 234 190  10 232 195  16 232 200  30
+-245 207  45 241 208  19 232 195  16 184 144  12
+-218 194 134 211 206 186  42  42  42   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 50  50  50  74  74  74  30  30  30   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  86  86  86  14  14  14   2   2   6
+-121  87  25 192 133   9 219 162  10 239 182  13
+-236 186  11 232 195  16 241 208  19 244 214  54
+-246 218  60 246 218  38 246 215  20 241 208  19
+-241 208  19 226 184  13 121  87  25   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 50  50  50  82  82  82  34  34  34  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  82  82  82  30  30  30  61  42   6
+-180 123   7 206 145  10 230 174  11 239 182  13
+-234 190  10 238 202  15 241 208  19 246 218  74
+-246 218  38 246 215  20 246 215  20 246 215  20
+-226 184  13 215 174  15 184 144  12   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 26  26  26  94  94  94  42  42  42  14  14  14
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78  50  50  50 104  69   6
+-192 133   9 216 158  10 236 178  12 236 186  11
+-232 195  16 241 208  19 244 214  54 245 215  43
+-246 215  20 246 215  20 241 208  19 198 155  10
+-200 144  11 216 158  10 156 118  10   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  90  90  90  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78  46  46  46  22  22  22
+-137  92   6 210 162  10 239 182  13 238 190  10
+-238 202  15 241 208  19 246 215  20 246 215  20
+-241 208  19 203 166  17 185 133  11 210 150  10
+-216 158  10 210 150  10 102  78  10   2   2   6
+-  6   6   6  54  54  54  14  14  14   2   2   6
+-  2   2   6  62  62  62  74  74  74  30  30  30
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  78  78  78  50  50  50   6   6   6
+- 94  70  30 139 102  15 190 146  13 226 184  13
+-232 200  30 232 195  16 215 174  15 190 146  13
+-168 122  10 192 133   9 210 150  10 213 154  11
+-202 150  34 182 157 106 101  98  89   2   2   6
+-  2   2   6  78  78  78 116 116 116  58  58  58
+-  2   2   6  22  22  22  90  90  90  46  46  46
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  50  50  50   6   6   6
+-128 128 128 174 154 114 156 107  11 168 122  10
+-198 155  10 184 144  12 197 138  11 200 144  11
+-206 145  10 206 145  10 197 138  11 188 164 115
+-195 195 195 198 198 198 174 174 174  14  14  14
+-  2   2   6  22  22  22 116 116 116 116 116 116
+- 22  22  22   2   2   6  74  74  74  70  70  70
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 101 101 101  26  26  26  10  10  10
+-138 138 138 190 190 190 174 154 114 156 107  11
+-197 138  11 200 144  11 197 138  11 192 133   9
+-180 123   7 190 142  34 190 178 144 187 187 187
+-202 202 202 221 221 221 214 214 214  66  66  66
+-  2   2   6   2   2   6  50  50  50  62  62  62
+-  6   6   6   2   2   6  10  10  10  90  90  90
+- 50  50  50  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  34  34  34
+- 74  74  74  74  74  74   2   2   6   6   6   6
+-144 144 144 198 198 198 190 190 190 178 166 146
+-154 121  60 156 107  11 156 107  11 168 124  44
+-174 154 114 187 187 187 190 190 190 210 210 210
+-246 246 246 253 253 253 253 253 253 182 182 182
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  62  62  62
+- 74  74  74  34  34  34  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0  10  10  10  22  22  22  54  54  54
+- 94  94  94  18  18  18   2   2   6  46  46  46
+-234 234 234 221 221 221 190 190 190 190 190 190
+-190 190 190 187 187 187 187 187 187 190 190 190
+-190 190 190 195 195 195 214 214 214 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+- 82  82  82   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  14  14  14
+- 86  86  86  54  54  54  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  46  46  46  90  90  90
+- 46  46  46  18  18  18   6   6   6 182 182 182
+-253 253 253 246 246 246 206 206 206 190 190 190
+-190 190 190 190 190 190 190 190 190 190 190 190
+-206 206 206 231 231 231 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-202 202 202  14  14  14   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 42  42  42  86  86  86  42  42  42  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 14  14  14  38  38  38  74  74  74  66  66  66
+-  2   2   6   6   6   6  90  90  90 250 250 250
+-253 253 253 253 253 253 238 238 238 198 198 198
+-190 190 190 190 190 190 195 195 195 221 221 221
+-246 246 246 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253  82  82  82   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  78  78  78  70  70  70  34  34  34
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 34  34  34  66  66  66  78  78  78   6   6   6
+-  2   2   6  18  18  18 218 218 218 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-226 226 226 231 231 231 246 246 246 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 178 178 178   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  18  18  18  90  90  90  62  62  62
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  26  26  26
+- 58  58  58  90  90  90  18  18  18   2   2   6
+-  2   2   6 110 110 110 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 231 231 231  18  18  18   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  94  94  94
+- 54  54  54  26  26  26  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  22  22  22  50  50  50
+- 90  90  90  26  26  26   2   2   6   2   2   6
+- 14  14  14 195 195 195 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 242 242 242  54  54  54   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+- 86  86  86  50  50  50  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  38  38  38  82  82  82
+- 34  34  34   2   2   6   2   2   6   2   2   6
+- 42  42  42 195 195 195 246 246 246 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 242 242 242 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 246 246 246 238 238 238
+-226 226 226 231 231 231 101 101 101   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 38  38  38  82  82  82  42  42  42  14  14  14
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  26  26  26  62  62  62  66  66  66
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 70  70  70 170 170 170 206 206 206 234 234 234
+-246 246 246 250 250 250 250 250 250 238 238 238
+-226 226 226 231 231 231 238 238 238 250 250 250
+-250 250 250 250 250 250 246 246 246 231 231 231
+-214 214 214 206 206 206 202 202 202 202 202 202
+-198 198 198 202 202 202 182 182 182  18  18  18
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  62  62  62  66  66  66  30  30  30
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  42  42  42  82  82  82  18  18  18
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 94  94  94 182 182 182 218 218 218 242 242 242
+-250 250 250 253 253 253 253 253 253 250 250 250
+-234 234 234 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-238 238 238 226 226 226 210 210 210 202 202 202
+-195 195 195 195 195 195 210 210 210 158 158 158
+-  6   6   6  14  14  14  50  50  50  14  14  14
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  86  86  86  46  46  46
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  54  54  54  70  70  70   2   2   6
+-  2   2   6  10  10  10   2   2   6  22  22  22
+-166 166 166 231 231 231 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-231 231 231 206 206 206 198 198 198 226 226 226
+- 94  94  94   2   2   6   6   6   6  38  38  38
+- 30  30  30   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  62  62  62  66  66  66
+- 26  26  26  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  74  74  74  50  50  50   2   2   6
+- 26  26  26  26  26  26   2   2   6 106 106 106
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 246 246 246 218 218 218 202 202 202
+-210 210 210  14  14  14   2   2   6   2   2   6
+- 30  30  30  22  22  22   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  86  86  86
+- 42  42  42  14  14  14   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  90  90  90  22  22  22   2   2   6
+- 42  42  42   2   2   6  18  18  18 218 218 218
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 250 250 250 221 221 221
+-218 218 218 101 101 101   2   2   6  14  14  14
+- 18  18  18  38  38  38  10  10  10   2   2   6
+-  2   2   6   2   2   6   2   2   6  78  78  78
+- 58  58  58  22  22  22   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 54  54  54  82  82  82   2   2   6  26  26  26
+- 22  22  22   2   2   6 123 123 123 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-238 238 238 198 198 198   6   6   6  38  38  38
+- 58  58  58  26  26  26  38  38  38   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+- 78  78  78  30  30  30  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  30  30  30
+- 74  74  74  58  58  58   2   2   6  42  42  42
+-  2   2   6  22  22  22 231 231 231 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 246 246 246  46  46  46  38  38  38
+- 42  42  42  14  14  14  38  38  38  14  14  14
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 86  86  86  46  46  46  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  42  42  42
+- 90  90  90  18  18  18  18  18  18  26  26  26
+-  2   2   6 116 116 116 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 250 250 250 238 238 238
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253  94  94  94   6   6   6
+-  2   2   6   2   2   6  10  10  10  34  34  34
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0  10  10  10  26  26  26  66  66  66
+- 82  82  82   2   2   6  38  38  38   6   6   6
+- 14  14  14 210 210 210 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 246 246 246 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 144 144 144   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 42  42  42  74  74  74  30  30  30  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  42  42  42  90  90  90
+- 26  26  26   6   6   6  42  42  42   2   2   6
+- 74  74  74 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 242 242 242 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 182 182 182   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 10  10  10  86  86  86  38  38  38  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  26  26  26  66  66  66  82  82  82
+-  2   2   6  22  22  22  18  18  18   2   2   6
+-149 149 149 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 206 206 206   2   2   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  86  86  86  46  46  46  14  14  14
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 18  18  18  46  46  46  86  86  86  18  18  18
+-  2   2   6  34  34  34  10  10  10   6   6   6
+-210 210 210 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 221 221 221   6   6   6
+-  2   2   6   2   2   6   6   6   6  30  30  30
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  82  82  82  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 26  26  26  66  66  66  62  62  62   2   2   6
+-  2   2   6  38  38  38  10  10  10  26  26  26
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 238 238 238
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231   6   6   6
+-  2   2   6   2   2   6  10  10  10  30  30  30
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  58  58  58  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  78  78  78   6   6   6   2   2   6
+-  2   2   6  46  46  46  14  14  14  42  42  42
+-246 246 246 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234  10  10  10
+-  2   2   6   2   2   6  22  22  22  14  14  14
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  62  62  62  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50  74  74  74   2   2   6   2   2   6
+- 14  14  14  70  70  70  34  34  34  62  62  62
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234  14  14  14
+-  2   2   6   2   2   6  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  62  62  62  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 54  54  54  62  62  62   2   2   6   2   2   6
+-  2   2   6  30  30  30  46  46  46  70  70  70
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 226 226 226  10  10  10
+-  2   2   6   6   6   6  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  58  58  58  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 58  58  58  62  62  62   2   2   6   2   2   6
+-  2   2   6   2   2   6  30  30  30  78  78  78
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 206 206 206   2   2   6
+- 22  22  22  34  34  34  18  14   6  22  22  22
+- 26  26  26  18  18  18   6   6   6   2   2   6
+-  2   2   6  82  82  82  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  26  26  26
+- 62  62  62 106 106 106  74  54  14 185 133  11
+-210 162  10 121  92   8   6   6   6  62  62  62
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 158 158 158  18  18  18
+- 14  14  14   2   2   6   2   2   6   2   2   6
+-  6   6   6  18  18  18  66  66  66  38  38  38
+-  6   6   6  94  94  94  50  50  50  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 10  10  10  10  10  10  18  18  18  38  38  38
+- 78  78  78 142 134 106 216 158  10 242 186  14
+-246 190  14 246 190  14 156 118  10  10  10  10
+- 90  90  90 238 238 238 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 230 190
+-238 204  91 238 204  91 181 142  44  37  26   9
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  38  38  38  46  46  46
+- 26  26  26 106 106 106  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  22  22  22
+- 30  30  30  38  38  38  50  50  50  70  70  70
+-106 106 106 190 142  34 226 170  11 242 186  14
+-246 190  14 246 190  14 246 190  14 154 114  10
+-  6   6   6  74  74  74 226 226 226 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 228 184  62
+-241 196  14 241 208  19 232 195  16  38  30  10
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  30  30  30  26  26  26
+-203 166  17 154 142  90  66  66  66  26  26  26
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  38  38  38  58  58  58
+- 78  78  78  86  86  86 101 101 101 123 123 123
+-175 146  61 210 150  10 234 174  13 246 186  14
+-246 190  14 246 190  14 246 190  14 238 190  10
+-102  78  10   2   2   6  46  46  46 198 198 198
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 224 178  62
+-242 186  14 241 196  14 210 166  10  22  18   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   6   6   6 121  92   8
+-238 202  15 232 195  16  82  82  82  34  34  34
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  38  38  38  70  70  70 154 122  46
+-190 142  34 200 144  11 197 138  11 197 138  11
+-213 154  11 226 170  11 242 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-225 175  15  46  32   6   2   2   6  22  22  22
+-158 158 158 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 242 242 242 224 178  62
+-239 182  13 236 186  11 213 154  11  46  32   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  61  42   6 225 175  15
+-238 190  10 236 186  11 112 100  78  42  42  42
+- 14  14  14   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  54  54  54 154 122  46 213 154  11
+-226 170  11 230 174  11 226 170  11 226 170  11
+-236 178  12 242 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-241 196  14 184 144  12  10  10  10   2   2   6
+-  6   6   6 116 116 116 242 242 242 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 231 231 231 198 198 198 214 170  54
+-236 178  12 236 178  12 210 150  10 137  92   6
+- 18  14   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  70  47   6 200 144  11 236 178  12
+-239 182  13 239 182  13 124 112  88  58  58  58
+- 22  22  22   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  70  70  70 180 133  36 226 170  11
+-239 182  13 242 186  14 242 186  14 246 186  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 232 195  16  98  70   6   2   2   6
+-  2   2   6   2   2   6  66  66  66 221 221 221
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 206 206 206 198 198 198 214 166  58
+-230 174  11 230 174  11 216 158  10 192 133   9
+-163 110   8 116  81   8 102  78  10 116  81   8
+-167 114   7 197 138  11 226 170  11 239 182  13
+-242 186  14 242 186  14 162 146  94  78  78  78
+- 34  34  34  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 30  30  30  78  78  78 190 142  34 226 170  11
+-239 182  13 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 241 196  14 203 166  17  22  18   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+-218 218 218 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 206 206 206 198 198 198 202 162  69
+-226 170  11 236 178  12 224 166  10 210 150  10
+-200 144  11 197 138  11 192 133   9 197 138  11
+-210 150  10 226 170  11 242 186  14 246 190  14
+-246 190  14 246 186  14 225 175  15 124 112  88
+- 62  62  62  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78 174 135  50 224 166  10
+-239 182  13 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 241 196  14 139 102  15
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 78  78  78 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 214 214 214 198 198 198 190 150  46
+-219 162  10 236 178  12 234 174  13 224 166  10
+-216 158  10 213 154  11 213 154  11 216 158  10
+-226 170  11 239 182  13 246 190  14 246 190  14
+-246 190  14 246 190  14 242 186  14 206 162  42
+-101 101 101  58  58  58  30  30  30  14  14  14
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  74  74  74 174 135  50 216 158  10
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 241 196  14 226 184  13
+- 61  42   6   2   2   6   2   2   6   2   2   6
+- 22  22  22 238 238 238 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 226 226 226 187 187 187 180 133  36
+-216 158  10 236 178  12 239 182  13 236 178  12
+-230 174  11 226 170  11 226 170  11 230 174  11
+-236 178  12 242 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 186  14 239 182  13
+-206 162  42 106 106 106  66  66  66  34  34  34
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 26  26  26  70  70  70 163 133  67 213 154  11
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 241 196  14
+-190 146  13  18  14   6   2   2   6   2   2   6
+- 46  46  46 246 246 246 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 221 221 221  86  86  86 156 107  11
+-216 158  10 236 178  12 242 186  14 246 186  14
+-242 186  14 239 182  13 239 182  13 242 186  14
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-242 186  14 225 175  15 142 122  72  66  66  66
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 26  26  26  70  70  70 163 133  67 210 150  10
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-232 195  16 121  92   8  34  34  34 106 106 106
+-221 221 221 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-242 242 242  82  82  82  18  14   6 163 110   8
+-216 158  10 236 178  12 242 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 242 186  14 163 133  67
+- 46  46  46  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78 163 133  67 210 150  10
+-236 178  12 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-241 196  14 215 174  15 190 178 144 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 218 218 218
+- 58  58  58   2   2   6  22  18   6 167 114   7
+-216 158  10 236 178  12 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 186  14 242 186  14 190 150  46
+- 54  54  54  22  22  22   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 38  38  38  86  86  86 180 133  36 213 154  11
+-236 178  12 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 232 195  16 190 146  13 214 214 214
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 170 170 170  26  26  26
+-  2   2   6   2   2   6  37  26   9 163 110   8
+-219 162  10 239 182  13 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 236 178  12 224 166  10 142 122  72
+- 46  46  46  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 109 106  95 192 133   9 224 166  10
+-242 186  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-242 186  14 226 184  13 210 162  10 142 110  46
+-226 226 226 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-198 198 198  66  66  66   2   2   6   2   2   6
+-  2   2   6   2   2   6  50  34   6 156 107  11
+-219 162  10 239 182  13 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 242 186  14
+-234 174  13 213 154  11 154 122  46  66  66  66
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 58  58  58 154 121  60 206 145  10 234 174  13
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 236 178  12 210 162  10 163 110   8
+- 61  42   6 138 138 138 218 218 218 250 250 250
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 210 210 210 144 144 144  66  66  66
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  61  42   6 163 110   8
+-216 158  10 236 178  12 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 239 182  13 230 174  11 216 158  10
+-190 142  34 124 112  88  70  70  70  38  38  38
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 62  62  62 168 124  44 206 145  10 224 166  10
+-236 178  12 239 182  13 242 186  14 242 186  14
+-246 186  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 236 178  12 216 158  10 175 118   6
+- 80  54   7   2   2   6   6   6   6  30  30  30
+- 54  54  54  62  62  62  50  50  50  38  38  38
+- 14  14  14   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  80  54   7 167 114   7
+-213 154  11 236 178  12 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 242 186  14 239 182  13 239 182  13
+-230 174  11 210 150  10 174 135  50 124 112  88
+- 82  82  82  54  54  54  34  34  34  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 158 118  36 192 133   9 200 144  11
+-216 158  10 219 162  10 224 166  10 226 170  11
+-230 174  11 236 178  12 239 182  13 239 182  13
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 230 174  11 210 150  10 163 110   8
+-104  69   6  10  10  10   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  91  60   6 167 114   7
+-206 145  10 230 174  11 242 186  14 246 190  14
+-246 190  14 246 190  14 246 186  14 242 186  14
+-239 182  13 230 174  11 224 166  10 213 154  11
+-180 133  36 124 112  88  86  86  86  58  58  58
+- 38  38  38  22  22  22  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 34  34  34  70  70  70 138 110  50 158 118  36
+-167 114   7 180 123   7 192 133   9 197 138  11
+-200 144  11 206 145  10 213 154  11 219 162  10
+-224 166  10 230 174  11 239 182  13 242 186  14
+-246 186  14 246 186  14 246 186  14 246 186  14
+-239 182  13 216 158  10 185 133  11 152  99   6
+-104  69   6  18  14   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  80  54   7 152  99   6
+-192 133   9 219 162  10 236 178  12 239 182  13
+-246 186  14 242 186  14 239 182  13 236 178  12
+-224 166  10 206 145  10 192 133   9 154 121  60
+- 94  94  94  62  62  62  42  42  42  22  22  22
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 18  18  18  34  34  34  58  58  58  78  78  78
+-101  98  89 124 112  88 142 110  46 156 107  11
+-163 110   8 167 114   7 175 118   6 180 123   7
+-185 133  11 197 138  11 210 150  10 219 162  10
+-226 170  11 236 178  12 236 178  12 234 174  13
+-219 162  10 197 138  11 163 110   8 130  83   6
+- 91  60   6  10  10  10   2   2   6   2   2   6
+- 18  18  18  38  38  38  38  38  38  38  38  38
+- 38  38  38  38  38  38  38  38  38  38  38  38
+- 38  38  38  38  38  38  26  26  26   2   2   6
+-  2   2   6   6   6   6  70  47   6 137  92   6
+-175 118   6 200 144  11 219 162  10 230 174  11
+-234 174  13 230 174  11 219 162  10 210 150  10
+-192 133   9 163 110   8 124 112  88  82  82  82
+- 50  50  50  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  22  22  22  34  34  34
+- 42  42  42  58  58  58  74  74  74  86  86  86
+-101  98  89 122 102  70 130  98  46 121  87  25
+-137  92   6 152  99   6 163 110   8 180 123   7
+-185 133  11 197 138  11 206 145  10 200 144  11
+-180 123   7 156 107  11 130  83   6 104  69   6
+- 50  34   6  54  54  54 110 110 110 101  98  89
+- 86  86  86  82  82  82  78  78  78  78  78  78
+- 78  78  78  78  78  78  78  78  78  78  78  78
+- 78  78  78  82  82  82  86  86  86  94  94  94
+-106 106 106 101 101 101  86  66  34 124  80   6
+-156 107  11 180 123   7 192 133   9 200 144  11
+-206 145  10 200 144  11 192 133   9 175 118   6
+-139 102  15 109 106  95  70  70  70  42  42  42
+- 22  22  22  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  10  10  10
+- 14  14  14  22  22  22  30  30  30  38  38  38
+- 50  50  50  62  62  62  74  74  74  90  90  90
+-101  98  89 112 100  78 121  87  25 124  80   6
+-137  92   6 152  99   6 152  99   6 152  99   6
+-138  86   6 124  80   6  98  70   6  86  66  30
+-101  98  89  82  82  82  58  58  58  46  46  46
+- 38  38  38  34  34  34  34  34  34  34  34  34
+- 34  34  34  34  34  34  34  34  34  34  34  34
+- 34  34  34  34  34  34  38  38  38  42  42  42
+- 54  54  54  82  82  82  94  86  76  91  60   6
+-134  86   6 156 107  11 167 114   7 175 118   6
+-175 118   6 167 114   7 152  99   6 121  87  25
+-101  98  89  62  62  62  34  34  34  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6   6   6   6  10  10  10
+- 18  18  18  22  22  22  30  30  30  42  42  42
+- 50  50  50  66  66  66  86  86  86 101  98  89
+-106  86  58  98  70   6 104  69   6 104  69   6
+-104  69   6  91  60   6  82  62  34  90  90  90
+- 62  62  62  38  38  38  22  22  22  14  14  14
+- 10  10  10  10  10  10  10  10  10  10  10  10
+- 10  10  10  10  10  10   6   6   6  10  10  10
+- 10  10  10  10  10  10  10  10  10  14  14  14
+- 22  22  22  42  42  42  70  70  70  89  81  66
+- 80  54   7 104  69   6 124  80   6 137  92   6
+-134  86   6 116  81   8 100  82  52  86  86  86
+- 58  58  58  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  10  10  10  14  14  14
+- 18  18  18  26  26  26  38  38  38  54  54  54
+- 70  70  70  86  86  86  94  86  76  89  81  66
+- 89  81  66  86  86  86  74  74  74  50  50  50
+- 30  30  30  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  34  34  34  58  58  58
+- 82  82  82  89  81  66  89  81  66  89  81  66
+- 94  86  66  94  86  76  74  74  74  50  50  50
+- 26  26  26  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6   6   6   6  14  14  14  18  18  18
+- 30  30  30  38  38  38  46  46  46  54  54  54
+- 50  50  50  42  42  42  30  30  30  18  18  18
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  26  26  26
+- 38  38  38  50  50  50  58  58  58  58  58  58
+- 54  54  54  42  42  42  30  30  30  18  18  18
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+-  6   6   6  10  10  10  14  14  14  18  18  18
+- 18  18  18  14  14  14  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 14  14  14  18  18  18  22  22  22  22  22  22
+- 18  18  18  14  14  14  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  3 3 3  0 0 0  0 0 0
++0 0 0  0 0 0  0 0 0  0 0 0  3 3 3  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  1 1 1  0 0 0
++0 0 0  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  2 1 0  2 1 0  3 2 2
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  2 2 2  0 0 0  3 4 3  26 28 28
++37 38 37  37 38 37  14 17 19  2 2 2  0 0 0  2 2 2
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  3 3 3  0 0 0  1 1 1  6 6 6
++2 2 2  0 0 0  3 3 3  4 4 4  4 4 4  4 4 4
++4 4 5  3 3 3  1 0 0  0 0 0  1 0 0  0 0 0
++1 1 1  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++2 2 2  0 0 0  0 0 0  14 17 19  60 74 84  137 136 137
++153 152 153  137 136 137  125 124 125  60 73 81  6 6 6  3 1 0
++0 0 0  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  0 0 0  4 4 4  41 54 63  125 124 125
++60 73 81  6 6 6  4 0 0  3 3 3  4 4 4  4 4 4
++4 4 4  0 0 0  6 9 11  41 54 63  41 65 82  22 30 35
++2 2 2  2 1 0  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  2 2 2  0 0 0
++4 0 0  6 6 6  41 54 63  137 136 137  174 174 174  167 166 167
++165 164 165  165 164 165  163 162 163  163 162 163  125 124 125  41 54 63
++1 1 1  0 0 0  0 0 0  3 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  5 5 5
++3 3 3  2 0 0  4 0 0  60 73 81  156 155 156  167 166 167
++163 162 163  85 115 134  5 7 8  0 0 0  4 4 4  5 5 5
++0 0 0  2 5 5  55 98 126  90 154 193  90 154 193  72 125 159
++37 51 59  2 0 0  1 1 1  4 5 5  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 4 4  1 1 1  0 0 0  3 3 3
++37 38 37  125 124 125  163 162 163  174 174 174  158 157 158  158 157 158
++156 155 156  156 155 156  158 157 158  165 164 165  174 174 174  166 165 166
++125 124 125  16 19 21  1 0 0  0 0 0  0 0 0  4 4 4
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  1 1 1
++0 0 0  0 0 0  37 38 37  153 152 153  174 174 174  158 157 158
++174 174 174  163 162 163  37 38 37  4 3 3  4 0 0  1 1 1
++0 0 0  22 40 52  101 161 196  101 161 196  90 154 193  101 161 196
++64 123 161  14 17 19  0 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++5 5 5  2 2 2  0 0 0  4 0 0  24 26 27  85 115 134
++156 155 156  174 174 174  167 166 167  156 155 156  154 153 154  157 156 157
++156 155 156  156 155 156  155 154 155  153 152 153  158 157 158  167 166 167
++174 174 174  156 155 156  60 74 84  16 19 21  0 0 0  0 0 0
++1 1 1  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  6 6 6  3 3 3  0 0 0  4 0 0
++13 16 17  60 73 81  137 136 137  165 164 165  156 155 156  153 152 153
++174 174 174  177 184 187  60 73 81  3 1 0  0 0 0  1 1 2
++22 30 35  64 123 161  136 185 209  90 154 193  90 154 193  90 154 193
++90 154 193  21 29 34  0 0 0  3 2 2  4 4 5  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  3 3 3
++0 0 0  0 0 0  10 13 16  60 74 84  157 156 157  174 174 174
++174 174 174  158 157 158  153 152 153  154 153 154  156 155 156  155 154 155
++156 155 156  155 154 155  154 153 154  157 156 157  154 153 154  153 152 153
++163 162 163  174 174 174  177 184 187  137 136 137  60 73 81  13 16 17
++4 0 0  0 0 0  3 3 3  5 5 5  4 4 4  4 4 4
++5 5 5  4 4 4  1 1 1  0 0 0  3 3 3  41 54 63
++131 129 131  174 174 174  174 174 174  174 174 174  167 166 167  174 174 174
++190 197 201  137 136 137  24 26 27  4 0 0  16 21 25  50 82 103
++90 154 193  136 185 209  90 154 193  101 161 196  101 161 196  101 161 196
++31 91 132  3 6 7  0 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  2 2 2  0 0 0  4 0 0
++4 0 0  43 57 68  137 136 137  177 184 187  174 174 174  163 162 163
++155 154 155  155 154 155  156 155 156  155 154 155  158 157 158  165 164 165
++167 166 167  166 165 166  163 162 163  157 156 157  155 154 155  155 154 155
++153 152 153  156 155 156  167 166 167  174 174 174  174 174 174  131 129 131
++41 54 63  5 5 5  0 0 0  0 0 0  3 3 3  4 4 4
++1 1 1  0 0 0  1 0 0  26 28 28  125 124 125  174 174 174
++177 184 187  174 174 174  174 174 174  156 155 156  131 129 131  137 136 137
++125 124 125  24 26 27  4 0 0  41 65 82  90 154 193  136 185 209
++136 185 209  101 161 196  53 118 160  37 112 160  90 154 193  34 86 122
++7 12 15  0 0 0  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  3 3 3  0 0 0  0 0 0  5 5 5  37 38 37
++125 124 125  167 166 167  174 174 174  167 166 167  158 157 158  155 154 155
++156 155 156  156 155 156  156 155 156  163 162 163  167 166 167  155 154 155
++137 136 137  153 152 153  156 155 156  165 164 165  163 162 163  156 155 156
++156 155 156  156 155 156  155 154 155  158 157 158  166 165 166  174 174 174
++167 166 167  125 124 125  37 38 37  1 0 0  0 0 0  0 0 0
++0 0 0  24 26 27  60 74 84  158 157 158  174 174 174  174 174 174
++166 165 166  158 157 158  125 124 125  41 54 63  13 16 17  6 6 6
++6 6 6  37 38 37  80 127 157  136 185 209  101 161 196  101 161 196
++90 154 193  28 67 93  6 10 14  13 20 25  13 20 25  6 10 14
++1 1 2  4 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++1 1 1  1 0 0  4 3 3  37 38 37  60 74 84  153 152 153
++167 166 167  167 166 167  158 157 158  154 153 154  155 154 155  156 155 156
++157 156 157  158 157 158  167 166 167  167 166 167  131 129 131  43 57 68
++26 28 28  37 38 37  60 73 81  131 129 131  165 164 165  166 165 166
++158 157 158  155 154 155  156 155 156  156 155 156  156 155 156  158 157 158
++165 164 165  174 174 174  163 162 163  60 74 84  16 19 21  13 16 17
++60 73 81  131 129 131  174 174 174  174 174 174  167 166 167  165 164 165
++137 136 137  60 73 81  24 26 27  4 0 0  4 0 0  16 19 21
++52 104 138  101 161 196  136 185 209  136 185 209  90 154 193  27 99 146
++13 20 25  4 5 7  2 5 5  4 5 7  1 1 2  0 0 0
++4 4 4  4 4 4  3 3 3  2 2 2  2 2 2  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  0 0 0
++0 0 0  13 16 17  60 73 81  137 136 137  174 174 174  166 165 166
++158 157 158  156 155 156  157 156 157  156 155 156  155 154 155  158 157 158
++167 166 167  174 174 174  153 152 153  60 73 81  16 19 21  4 0 0
++4 0 0  4 0 0  6 6 6  26 28 28  60 74 84  158 157 158
++174 174 174  166 165 166  157 156 157  155 154 155  156 155 156  156 155 156
++155 154 155  158 157 158  167 166 167  167 166 167  131 129 131  125 124 125
++137 136 137  167 166 167  167 166 167  174 174 174  158 157 158  125 124 125
++16 19 21  4 0 0  4 0 0  10 13 16  49 76 92  107 159 188
++136 185 209  136 185 209  90 154 193  26 108 161  22 40 52  6 10 14
++2 3 3  1 1 2  1 1 2  4 4 5  4 4 5  4 4 5
++4 4 5  2 2 1  0 0 0  0 0 0  0 0 0  2 2 2
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  3 3 3  0 0 0  1 0 0  4 0 0
++37 51 59  131 129 131  167 166 167  167 166 167  163 162 163  157 156 157
++157 156 157  155 154 155  153 152 153  157 156 157  167 166 167  174 174 174
++153 152 153  125 124 125  37 38 37  4 0 0  4 0 0  4 0 0
++4 3 3  4 3 3  4 0 0  6 6 6  4 0 0  37 38 37
++125 124 125  174 174 174  174 174 174  165 164 165  156 155 156  154 153 154
++156 155 156  156 155 156  155 154 155  163 162 163  158 157 158  163 162 163
++174 174 174  174 174 174  174 174 174  125 124 125  37 38 37  0 0 0
++4 0 0  6 9 11  41 54 63  90 154 193  136 185 209  146 190 211
++136 185 209  37 112 160  22 40 52  6 10 14  3 6 7  1 1 2
++1 1 2  3 3 3  1 1 2  3 3 3  4 4 4  4 4 4
++2 2 2  2 0 0  16 19 21  37 38 37  24 26 27  0 0 0
++0 0 0  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  5 5 5
++4 4 4  0 0 0  0 0 0  0 0 0  26 28 28  120 125 127
++158 157 158  174 174 174  165 164 165  157 156 157  155 154 155  156 155 156
++153 152 153  153 152 153  167 166 167  174 174 174  174 174 174  125 124 125
++37 38 37  4 0 0  0 0 0  4 0 0  4 3 3  4 4 4
++4 4 4  4 4 4  5 5 5  4 0 0  4 0 0  4 0 0
++4 3 3  43 57 68  137 136 137  174 174 174  174 174 174  165 164 165
++154 153 154  153 152 153  153 152 153  153 152 153  163 162 163  174 174 174
++174 174 174  153 152 153  60 73 81  6 6 6  4 0 0  4 3 3
++32 43 50  80 127 157  136 185 209  146 190 211  146 190 211  90 154 193
++28 67 93  28 67 93  40 71 93  3 6 7  1 1 2  2 5 5
++50 82 103  79 117 143  26 37 45  0 0 0  3 3 3  1 1 1
++0 0 0  41 54 63  137 136 137  174 174 174  153 152 153  60 73 81
++2 0 0  0 0 0
++4 4 4  4 4 4  4 4 4  4 4 4  6 6 6  2 2 2
++0 0 0  2 0 0  24 26 27  60 74 84  153 152 153  174 174 174
++174 174 174  157 156 157  154 153 154  156 155 156  154 153 154  153 152 153
++165 164 165  174 174 174  177 184 187  137 136 137  43 57 68  6 6 6
++4 0 0  2 0 0  3 3 3  5 5 5  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  6 6 6  4 3 3
++4 0 0  4 0 0  24 26 27  60 73 81  153 152 153  174 174 174
++174 174 174  158 157 158  158 157 158  174 174 174  174 174 174  158 157 158
++60 74 84  24 26 27  4 0 0  4 0 0  17 23 27  59 113 148
++136 185 209  191 222 234  146 190 211  136 185 209  31 91 132  7 11 13
++22 40 52  101 161 196  90 154 193  6 9 11  3 4 4  43 95 132
++136 185 209  172 205 220  55 98 126  0 0 0  0 0 0  2 0 0
++26 28 28  153 152 153  177 184 187  167 166 167  177 184 187  165 164 165
++37 38 37  0 0 0
++4 4 4  4 4 4  5 5 5  5 5 5  1 1 1  0 0 0
++13 16 17  60 73 81  137 136 137  174 174 174  174 174 174  165 164 165
++153 152 153  153 152 153  155 154 155  154 153 154  158 157 158  174 174 174
++177 184 187  163 162 163  60 73 81  16 19 21  4 0 0  4 0 0
++4 3 3  4 4 4  5 5 5  5 5 5  4 4 4  5 5 5
++5 5 5  5 5 5  5 5 5  4 4 4  4 4 4  5 5 5
++6 6 6  4 0 0  4 0 0  4 0 0  24 26 27  60 74 84
++166 165 166  174 174 174  177 184 187  165 164 165  125 124 125  24 26 27
++4 0 0  4 0 0  5 5 5  50 82 103  136 185 209  172 205 220
++146 190 211  136 185 209  26 108 161  22 40 52  7 12 15  44 81 103
++71 116 144  28 67 93  37 51 59  41 65 82  100 139 164  101 161 196
++90 154 193  90 154 193  28 67 93  0 0 0  0 0 0  26 28 28
++125 124 125  167 166 167  163 162 163  153 152 153  163 162 163  174 174 174
++85 115 134  4 0 0
++4 4 4  5 5 5  4 4 4  1 0 0  4 0 0  34 47 55
++125 124 125  174 174 174  174 174 174  167 166 167  157 156 157  153 152 153
++155 154 155  155 154 155  158 157 158  166 165 166  167 166 167  154 153 154
++125 124 125  26 28 28  4 0 0  4 0 0  4 0 0  5 5 5
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  1 1 1
++0 0 0  0 0 0  1 1 1  4 4 4  4 4 4  4 4 4
++5 5 5  5 5 5  4 3 3  4 0 0  4 0 0  6 6 6
++37 38 37  131 129 131  137 136 137  37 38 37  0 0 0  4 0 0
++4 5 5  43 61 72  90 154 193  172 205 220  146 190 211  136 185 209
++90 154 193  28 67 93  13 20 25  43 61 72  71 116 144  44 81 103
++2 5 5  7 11 13  59 113 148  101 161 196  90 154 193  28 67 93
++13 20 25  6 10 14  0 0 0  13 16 17  60 73 81  137 136 137
++166 165 166  158 157 158  156 155 156  154 153 154  167 166 167  174 174 174
++60 73 81  4 0 0
++4 4 4  4 4 4  0 0 0  3 3 3  60 74 84  174 174 174
++174 174 174  167 166 167  163 162 163  155 154 155  157 156 157  155 154 155
++156 155 156  163 162 163  167 166 167  158 157 158  125 124 125  37 38 37
++4 3 3  4 0 0  4 0 0  6 6 6  6 6 6  5 5 5
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  2 3 3
++10 13 16  7 11 13  1 0 0  0 0 0  2 2 1  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  4 0 0
++4 0 0  7 11 13  13 16 17  4 0 0  3 3 3  34 47 55
++80 127 157  146 190 211  172 205 220  136 185 209  136 185 209  136 185 209
++28 67 93  22 40 52  55 98 126  55 98 126  21 29 34  7 11 13
++50 82 103  101 161 196  101 161 196  35 83 115  13 20 25  2 2 1
++1 1 2  1 1 2  37 51 59  131 129 131  174 174 174  174 174 174
++167 166 167  163 162 163  163 162 163  167 166 167  174 174 174  125 124 125
++16 19 21  4 0 0
++4 4 4  4 0 0  4 0 0  60 74 84  174 174 174  174 174 174
++158 157 158  155 154 155  155 154 155  156 155 156  155 154 155  158 157 158
++167 166 167  165 164 165  131 129 131  60 73 81  13 16 17  4 0 0
++4 0 0  4 3 3  6 6 6  4 3 3  5 5 5  4 4 4
++4 4 4  3 2 2  0 0 0  0 0 0  7 11 13  45 69 86
++80 127 157  71 116 144  43 61 72  7 11 13  0 0 0  1 1 1
++4 3 3  4 4 4  4 4 4  4 4 4  6 6 6  5 5 5
++3 2 2  4 0 0  1 0 0  21 29 34  59 113 148  136 185 209
++146 190 211  136 185 209  136 185 209  136 185 209  136 185 209  136 185 209
++68 124 159  44 81 103  22 40 52  13 16 17  43 61 72  90 154 193
++136 185 209  59 113 148  21 29 34  3 4 3  1 1 1  0 0 0
++24 26 27  125 124 125  163 162 163  174 174 174  166 165 166  165 164 165
++163 162 163  125 124 125  125 124 125  125 124 125  125 124 125  26 28 28
++4 0 0  4 3 3
++3 3 3  0 0 0  24 26 27  153 152 153  177 184 187  158 157 158
++156 155 156  156 155 156  155 154 155  155 154 155  165 164 165  174 174 174
++155 154 155  60 74 84  26 28 28  4 0 0  4 0 0  3 1 0
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 3 3
++2 0 0  0 0 0  0 0 0  32 43 50  72 125 159  101 161 196
++136 185 209  101 161 196  101 161 196  79 117 143  32 43 50  0 0 0
++0 0 0  2 2 2  4 4 4  4 4 4  3 3 3  1 0 0
++0 0 0  4 5 5  49 76 92  101 161 196  146 190 211  146 190 211
++136 185 209  136 185 209  136 185 209  136 185 209  136 185 209  90 154 193
++28 67 93  13 16 17  37 51 59  80 127 157  136 185 209  90 154 193
++22 40 52  6 9 11  3 4 3  2 2 1  16 19 21  60 73 81
++137 136 137  163 162 163  158 157 158  166 165 166  167 166 167  153 152 153
++60 74 84  37 38 37  6 6 6  13 16 17  4 0 0  1 0 0
++3 2 2  4 4 4
++3 2 2  4 0 0  37 38 37  137 136 137  167 166 167  158 157 158
++157 156 157  154 153 154  157 156 157  167 166 167  174 174 174  125 124 125
++37 38 37  4 0 0  4 0 0  4 0 0  4 3 3  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  1 1 1  0 0 0
++0 0 0  16 21 25  55 98 126  90 154 193  136 185 209  101 161 196
++101 161 196  101 161 196  136 185 209  136 185 209  101 161 196  55 98 126
++14 17 19  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
++22 40 52  90 154 193  146 190 211  146 190 211  136 185 209  136 185 209
++136 185 209  136 185 209  136 185 209  101 161 196  35 83 115  7 11 13
++17 23 27  59 113 148  136 185 209  101 161 196  34 86 122  7 12 15
++2 5 5  3 4 3  6 6 6  60 73 81  131 129 131  163 162 163
++166 165 166  174 174 174  174 174 174  163 162 163  125 124 125  41 54 63
++13 16 17  4 0 0  4 0 0  4 0 0  1 0 0  2 2 2
++4 4 4  4 4 4
++1 1 1  2 1 0  43 57 68  137 136 137  153 152 153  153 152 153
++163 162 163  156 155 156  165 164 165  167 166 167  60 74 84  6 6 6
++4 0 0  4 0 0  5 5 5  4 4 4  4 4 4  4 4 4
++4 5 5  6 6 6  4 3 3  0 0 0  0 0 0  11 15 18
++40 71 93  100 139 164  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  136 185 209  136 185 209
++101 161 196  45 69 86  6 6 6  0 0 0  17 23 27  55 98 126
++136 185 209  146 190 211  136 185 209  136 185 209  136 185 209  136 185 209
++136 185 209  136 185 209  90 154 193  22 40 52  7 11 13  50 82 103
++136 185 209  136 185 209  53 118 160  22 40 52  7 11 13  2 5 5
++3 4 3  37 38 37  125 124 125  157 156 157  166 165 166  167 166 167
++174 174 174  174 174 174  137 136 137  60 73 81  4 0 0  4 0 0
++4 0 0  4 0 0  5 5 5  3 3 3  3 3 3  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  137 136 137  125 124 125  131 129 131
++155 154 155  167 166 167  174 174 174  60 74 84  6 6 6  4 0 0
++4 3 3  6 6 6  4 4 4  4 4 4  4 4 4  5 5 5
++4 4 4  1 1 1  0 0 0  3 6 7  41 65 82  72 125 159
++101 161 196  101 161 196  101 161 196  90 154 193  90 154 193  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  136 185 209
++136 185 209  136 185 209  80 127 157  55 98 126  101 161 196  146 190 211
++136 185 209  136 185 209  136 185 209  101 161 196  136 185 209  101 161 196
++136 185 209  101 161 196  35 83 115  22 30 35  101 161 196  172 205 220
++90 154 193  28 67 93  7 11 13  2 5 5  3 4 3  13 16 17
++85 115 134  167 166 167  174 174 174  174 174 174  174 174 174  174 174 174
++167 166 167  60 74 84  13 16 17  4 0 0  4 0 0  4 3 3
++6 6 6  5 5 5  4 4 4  5 5 5  4 4 4  5 5 5
++5 5 5  5 5 5
++1 1 1  4 0 0  41 54 63  137 136 137  137 136 137  125 124 125
++131 129 131  167 166 167  157 156 157  37 38 37  6 6 6  4 0 0
++6 6 6  5 5 5  4 4 4  4 4 4  4 5 5  2 2 1
++0 0 0  0 0 0  26 37 45  58 111 146  101 161 196  101 161 196
++101 161 196  90 154 193  90 154 193  90 154 193  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  136 185 209  136 185 209  136 185 209  146 190 211  136 185 209
++136 185 209  101 161 196  136 185 209  136 185 209  101 161 196  136 185 209
++101 161 196  136 185 209  136 185 209  136 185 209  136 185 209  16 89 141
++7 11 13  2 5 5  2 5 5  13 16 17  60 73 81  154 154 154
++174 174 174  174 174 174  174 174 174  174 174 174  163 162 163  125 124 125
++24 26 27  4 0 0  4 0 0  4 0 0  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
++5 5 5  4 4 4
++4 0 0  6 6 6  37 38 37  137 136 137  137 136 137  131 129 131
++131 129 131  153 152 153  131 129 131  26 28 28  4 0 0  4 3 3
++6 6 6  4 4 4  4 4 4  4 4 4  0 0 0  0 0 0
++13 20 25  51 88 114  90 154 193  101 161 196  101 161 196  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  136 185 209  101 161 196
++101 161 196  136 185 209  101 161 196  136 185 209  136 185 209  101 161 196
++136 185 209  101 161 196  136 185 209  101 161 196  101 161 196  101 161 196
++136 185 209  136 185 209  136 185 209  37 112 160  21 29 34  5 7 8
++2 5 5  13 16 17  43 57 68  131 129 131  174 174 174  174 174 174
++174 174 174  167 166 167  157 156 157  125 124 125  37 38 37  4 0 0
++4 0 0  4 0 0  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  41 54 63  153 152 153  137 136 137  137 136 137
++137 136 137  153 152 153  125 124 125  24 26 27  4 0 0  3 2 2
++4 4 4  4 4 4  4 3 3  4 0 0  3 6 7  43 61 72
++64 123 161  101 161 196  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  101 161 196  90 154 193
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++136 185 209  101 161 196  101 161 196  136 185 209  136 185 209  101 161 196
++101 161 196  90 154 193  28 67 93  13 16 17  7 11 13  3 6 7
++37 51 59  125 124 125  163 162 163  174 174 174  167 166 167  166 165 166
++167 166 167  131 129 131  60 73 81  4 0 0  4 0 0  4 0 0
++3 3 3  5 5 5  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  137 136 137  153 152 153  137 136 137
++153 152 153  157 156 157  125 124 125  24 26 27  0 0 0  2 2 2
++4 4 4  4 4 4  2 0 0  0 0 0  28 67 93  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  64 123 161  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++90 154 193  101 161 196  101 161 196  101 161 196  90 154 193  136 185 209
++101 161 196  101 161 196  136 185 209  101 161 196  136 185 209  101 161 196
++101 161 196  101 161 196  136 185 209  101 161 196  101 161 196  90 154 193
++35 83 115  13 16 17  3 6 7  2 5 5  13 16 17  60 74 84
++154 154 154  166 165 166  165 164 165  158 157 158  163 162 163  157 156 157
++60 74 84  13 16 17  4 0 0  4 0 0  3 2 2  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  41 54 63  157 156 157  155 154 155  137 136 137
++153 152 153  158 157 158  137 136 137  26 28 28  2 0 0  2 2 2
++4 4 4  4 4 4  1 0 0  6 10 14  34 86 122  90 154 193
++64 123 161  90 154 193  64 123 161  90 154 193  90 154 193  90 154 193
++64 123 161  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++136 185 209  101 161 196  136 185 209  90 154 193  26 108 161  22 40 52
++13 16 17  5 7 8  2 5 5  2 5 5  37 38 37  165 164 165
++174 174 174  163 162 163  154 154 154  165 164 165  167 166 167  60 73 81
++6 6 6  4 0 0  4 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  41 54 63  156 155 156  158 157 158  153 152 153
++156 155 156  165 164 165  137 136 137  26 28 28  0 0 0  2 2 2
++4 4 5  4 4 4  2 0 0  7 12 15  31 96 139  64 123 161
++90 154 193  64 123 161  90 154 193  90 154 193  64 123 161  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  136 185 209
++101 161 196  136 185 209  26 108 161  22 40 52  7 11 13  5 7 8
++2 5 5  2 5 5  2 5 5  2 2 1  37 38 37  158 157 158
++174 174 174  154 154 154  156 155 156  167 166 167  165 164 165  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  157 156 157  163 162 163  153 152 153
++158 157 158  167 166 167  137 136 137  26 28 28  2 0 0  2 2 2
++4 5 5  4 4 4  4 0 0  7 12 15  24 86 132  26 108 161
++37 112 160  64 123 161  90 154 193  64 123 161  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  101 161 196  90 154 193  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  136 185 209  101 161 196  136 185 209
++90 154 193  35 83 115  13 16 17  13 16 17  7 11 13  3 6 7
++5 7 8  6 6 6  3 4 3  2 2 1  30 32 34  154 154 154
++167 166 167  154 154 154  154 154 154  174 174 174  165 164 165  37 38 37
++6 6 6  4 0 0  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  163 162 163  166 165 166  154 154 154
++163 162 163  174 174 174  137 136 137  26 28 28  0 0 0  2 2 2
++4 5 5  4 4 5  1 1 2  6 10 14  28 67 93  18 97 151
++18 97 151  18 97 151  26 108 161  37 112 160  37 112 160  90 154 193
++64 123 161  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++90 154 193  101 161 196  101 161 196  90 154 193  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  136 185 209  90 154 193  16 89 141
++13 20 25  7 11 13  5 7 8  5 7 8  2 5 5  4 5 5
++3 4 3  4 5 5  3 4 3  0 0 0  37 38 37  158 157 158
++174 174 174  158 157 158  158 157 158  167 166 167  174 174 174  41 54 63
++4 0 0  3 2 2  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  165 164 165  174 174 174  158 157 158
++167 166 167  174 174 174  153 152 153  26 28 28  2 0 0  2 2 2
++4 5 5  4 4 4  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  18 97 151  18 97 151  26 108 161  26 108 161  26 108 161
++26 108 161  37 112 160  53 118 160  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  136 185 209  90 154 193  26 108 161  22 40 52  13 16 17
++7 11 13  3 6 7  5 7 8  5 7 8  2 5 5  4 5 5
++4 5 5  6 6 6  3 4 3  0 0 0  30 32 34  158 157 158
++174 174 174  156 155 156  155 154 155  165 164 165  154 153 154  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  167 166 167  174 174 174  163 162 163
++174 174 174  174 174 174  153 152 153  26 28 28  0 0 0  3 3 3
++5 5 5  4 4 4  1 1 2  7 12 15  28 67 93  18 97 151
++18 97 151  18 97 151  18 97 151  18 97 151  18 97 151  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++90 154 193  26 108 161  90 154 193  90 154 193  90 154 193  101 161 196
++101 161 196  26 108 161  22 40 52  13 16 17  7 11 13  2 5 5
++2 5 5  6 6 6  2 5 5  4 5 5  4 5 5  4 5 5
++3 4 3  5 5 5  3 4 3  2 0 0  30 32 34  137 136 137
++153 152 153  137 136 137  131 129 131  137 136 137  131 129 131  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  167 166 167  174 174 174  166 165 166
++174 174 174  177 184 187  153 152 153  30 32 34  1 0 0  3 3 3
++5 5 5  4 3 3  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  18 97 151  18 97 151  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  90 154 193  90 154 193  26 108 161
++35 83 115  13 16 17  7 11 13  5 7 8  3 6 7  5 7 8
++2 5 5  6 6 6  4 5 5  4 5 5  3 4 3  4 5 5
++3 4 3  6 6 6  3 4 3  0 0 0  26 28 28  125 124 125
++131 129 131  125 124 125  125 124 125  131 129 131  131 129 131  37 38 37
++4 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  174 174 174  177 184 187  167 166 167
++174 174 174  177 184 187  153 152 153  30 32 34  0 0 0  3 3 3
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  18 97 151
++18 97 151  18 97 151  18 97 151  18 97 151  18 97 151  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  90 154 193  26 108 161  26 108 161  24 86 132  13 20 25
++7 11 13  13 20 25  22 40 52  5 7 8  3 4 3  3 4 3
++4 5 5  3 4 3  4 5 5  3 4 3  4 5 5  3 4 3
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  125 124 125
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  174 174 174  177 184 187  174 174 174
++174 174 174  190 197 201  157 156 157  30 32 34  1 0 0  3 3 3
++5 5 5  4 3 3  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  19 95 150  19 95 150  18 97 151  18 97 151  26 108 161
++18 97 151  26 108 161  26 108 161  26 108 161  26 108 161  90 154 193
++26 108 161  26 108 161  26 108 161  22 40 52  2 5 5  3 4 3
++28 67 93  37 112 160  34 86 122  2 5 5  3 4 3  3 4 3
++3 4 3  3 4 3  3 4 3  2 2 1  3 4 3  4 4 4
++4 5 5  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  174 174 174  177 184 187  174 174 174
++174 174 174  190 197 201  158 157 158  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  18 97 151
++10 87 144  19 95 150  19 95 150  18 97 151  18 97 151  18 97 151
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++18 97 151  22 40 52  2 5 5  2 2 1  22 40 52  26 108 161
++90 154 193  37 112 160  22 40 52  3 4 3  13 20 25  22 30 35
++3 6 7  1 1 1  2 2 2  6 9 11  5 5 5  4 3 3
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  177 184 187  193 200 203  174 174 174
++177 184 187  193 200 203  163 162 163  30 32 34  4 0 0  2 2 2
++5 5 5  4 3 3  4 0 0  6 10 14  24 86 132  10 87 144
++10 87 144  10 87 144  19 95 150  19 95 150  19 95 150  18 97 151
++26 108 161  26 108 161  26 108 161  90 154 193  26 108 161  28 67 93
++6 10 14  2 5 5  13 20 25  24 86 132  37 112 160  90 154 193
++10 87 144  7 12 15  2 5 5  28 67 93  37 112 160  28 67 93
++2 2 1  7 12 15  35 83 115  28 67 93  3 6 7  1 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  174 174 174  190 197 201  174 174 174
++177 184 187  193 200 203  163 162 163  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  16 89 141  19 95 150  10 87 144  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  28 67 93  6 10 14  1 1 2
++7 12 15  28 67 93  26 108 161  16 89 141  24 86 132  21 29 34
++3 4 3  21 29 34  37 112 160  37 112 160  27 99 146  21 29 34
++21 29 34  26 108 161  90 154 193  35 83 115  1 1 2  2 0 0
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  125 124 125
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  193 200 203  193 200 203  174 174 174
++190 197 201  193 200 203  165 164 165  37 38 37  4 0 0  2 2 2
++5 5 5  4 3 3  4 0 0  6 10 14  24 86 132  10 87 144
++10 87 144  10 87 144  16 89 141  18 97 151  18 97 151  10 87 144
++24 86 132  24 86 132  13 20 25  4 5 7  4 5 7  22 40 52
++18 97 151  37 112 160  26 108 161  7 12 15  1 1 1  0 0 0
++28 67 93  37 112 160  26 108 161  28 67 93  22 40 52  28 67 93
++26 108 161  90 154 193  26 108 161  10 87 144  0 0 0  2 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  193 200 203  174 174 174
++190 197 201  193 200 203  165 164 165  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  10 87 144  18 97 151  28 67 93  6 10 14
++0 0 0  1 1 2  4 5 7  13 20 25  16 89 141  26 108 161
++26 108 161  26 108 161  24 86 132  6 9 11  2 3 3  22 40 52
++37 112 160  16 89 141  22 40 52  28 67 93  26 108 161  26 108 161
++90 154 193  26 108 161  26 108 161  28 67 93  1 1 1  4 0 0
++4 4 4  5 5 5  3 3 3  4 0 0  26 28 28  124 126 130
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  193 200 203  193 200 203  174 174 174
++193 200 203  193 200 203  167 166 167  37 38 37  4 0 0  2 2 2
++5 5 5  4 4 4  4 0 0  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  13 20 25  4 5 7
++1 1 2  1 1 1  22 40 52  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  24 86 132  22 40 52  22 40 52
++22 40 52  22 40 52  10 87 144  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  90 154 193  10 87 144  0 0 0  4 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  205 212 215  167 166 167  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  22 40 52  1 1 2
++2 0 0  1 1 2  24 86 132  26 108 161  26 108 161  26 108 161
++26 108 161  19 95 150  16 89 141  10 87 144  22 40 52  22 40 52
++10 87 144  26 108 161  37 112 160  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  28 67 93  2 0 0  3 1 0
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  190 197 201  174 174 174
++193 200 203  193 200 203  174 174 174  37 38 37  4 0 0  2 2 2
++5 5 5  4 4 4  3 2 2  1 1 2  13 20 25  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  13 20 25
++13 20 25  22 40 52  10 87 144  18 97 151  18 97 151  26 108 161
++10 87 144  13 20 25  6 10 14  21 29 34  24 86 132  18 97 151
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  90 154 193  18 97 151  13 20 25  0 0 0  4 3 3
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  220 221 221  167 166 167  30 32 34  1 0 0  2 2 2
++5 5 5  4 4 4  4 4 5  2 5 5  4 5 7  13 20 25
++28 67 93  10 87 144  10 87 144  10 87 144  10 87 144  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  18 97 151  18 97 151
++28 67 93  2 3 3  0 0 0  28 67 93  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  10 87 144  13 20 25  1 1 2  3 2 2  4 4 4
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  190 197 201  174 174 174
++193 200 203  193 200 203  174 174 174  26 28 28  4 0 0  4 3 3
++5 5 5  4 4 4  4 4 4  4 4 5  1 1 2  2 5 5
++4 5 7  22 40 52  10 87 144  10 87 144  18 97 151  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  18 97 151
++10 87 144  28 67 93  22 40 52  10 87 144  26 108 161  18 97 151
++18 97 151  18 97 151  26 108 161  26 108 161  26 108 161  26 108 161
++22 40 52  1 1 2  0 0 0  2 3 3  4 4 4  4 4 4
++4 4 4  5 5 5  4 4 4  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  220 221 221  190 197 201  41 54 63  4 0 0  2 2 2
++6 6 6  4 4 4  4 4 4  4 4 5  4 4 5  3 3 3
++1 1 2  1 1 2  6 10 14  22 40 52  10 87 144  18 97 151
++18 97 151  10 87 144  10 87 144  10 87 144  18 97 151  10 87 144
++10 87 144  18 97 151  26 108 161  18 97 151  18 97 151  10 87 144
++26 108 161  26 108 161  26 108 161  10 87 144  28 67 93  6 10 14
++1 1 2  1 1 2  4 3 3  4 4 5  4 4 4  4 4 4
++5 5 5  5 5 5  1 1 1  4 0 0  37 51 59  137 136 137
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  193 200 203  174 174 174
++193 200 203  193 200 203  220 221 221  137 136 137  13 16 17  4 0 0
++2 2 2  4 4 4  4 4 4  4 4 4  4 4 4  4 4 5
++4 4 5  4 3 3  1 1 2  4 5 7  13 20 25  28 67 93
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  10 87 144
++10 87 144  18 97 151  18 97 151  10 87 144  18 97 151  26 108 161
++26 108 161  18 97 151  28 67 93  6 10 14  0 0 0  0 0 0
++2 3 3  4 5 5  4 4 5  4 4 4  4 4 4  5 5 5
++3 3 3  1 1 1  0 0 0  16 19 21  125 124 125  137 136 137
++131 129 131  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++193 200 203  190 197 201  220 221 221  220 221 221  153 152 153  30 32 34
++0 0 0  0 0 0  2 2 2  4 4 4  4 4 4  4 4 4
++4 4 4  4 5 5  4 5 7  1 1 2  1 1 2  4 5 7
++13 20 25  28 67 93  10 87 144  18 97 151  10 87 144  10 87 144
++10 87 144  10 87 144  10 87 144  18 97 151  26 108 161  18 97 151
++28 67 93  7 12 15  0 0 0  0 0 0  2 2 1  4 4 4
++4 5 5  4 5 5  4 4 4  4 4 4  3 3 3  0 0 0
++0 0 0  0 0 0  37 38 37  125 124 125  158 157 158  131 129 131
++125 124 125  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  4 0 0  41 54 63  193 200 203  220 221 221  174 174 174
++193 200 203  193 200 203  193 200 203  220 221 221  244 246 246  193 200 203
++120 125 127  5 5 5  1 0 0  0 0 0  1 1 1  4 4 4
++4 4 4  4 4 4  4 5 5  4 5 5  4 4 5  1 1 2
++4 5 7  4 5 7  22 40 52  10 87 144  10 87 144  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  10 87 144  13 20 25
++4 5 7  2 3 3  1 1 2  4 4 4  4 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  1 1 2
++24 26 27  60 74 84  153 152 153  163 162 163  137 136 137  125 124 125
++125 124 125  125 124 125  125 124 125  137 136 137  125 124 125  26 28 28
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  26 28 28  156 155 156  220 221 221  220 221 221
++174 174 174  193 200 203  193 200 203  193 200 203  205 212 215  220 221 221
++220 221 221  167 166 167  60 73 81  7 11 13  0 0 0  0 0 0
++3 3 3  4 4 4  4 4 4  4 4 4  4 4 5  4 4 5
++4 4 5  1 1 2  1 1 2  4 5 7  22 40 52  10 87 144
++10 87 144  10 87 144  10 87 144  22 40 52  4 5 7  1 1 2
++1 1 2  4 4 5  4 4 4  4 4 4  4 4 4  4 4 4
++5 5 5  2 2 2  0 0 0  4 0 0  16 19 21  60 73 81
++137 136 137  167 166 167  158 157 158  137 136 137  131 129 131  131 129 131
++125 124 125  125 124 125  131 129 131  155 154 155  60 74 84  5 7 8
++0 0 0  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 0 0  4 0 0  60 73 81  193 200 203  220 221 221
++193 200 203  193 200 203  193 200 203  193 200 203  205 212 215  220 221 221
++220 221 221  220 221 221  220 221 221  137 136 137  43 57 68  6 6 6
++4 0 0  1 1 1  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 5  4 4 5  3 2 2  1 1 2  2 5 5  13 20 25
++22 40 52  22 40 52  13 20 25  2 3 3  1 1 2  3 3 3
++4 5 7  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++1 1 1  0 0 0  2 3 3  41 54 63  131 129 131  166 165 166
++166 165 166  155 154 155  153 152 153  137 136 137  137 136 137  125 124 125
++125 124 125  137 136 137  137 136 137  125 124 125  37 38 37  4 3 3
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  6 6 6  6 6 6  13 16 17  60 73 81  167 166 167
++220 221 221  220 221 221  220 221 221  193 200 203  193 200 203  193 200 203
++205 212 215  220 221 221  220 221 221  244 246 246  205 212 215  125 124 125
++24 26 27  0 0 0  0 0 0  2 2 2  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 5  1 1 2  4 5 7
++4 5 7  4 5 7  1 1 2  3 2 2  4 4 5  4 4 4
++4 4 4  4 4 4  5 5 5  4 4 4  0 0 0  0 0 0
++2 0 0  26 28 28  125 124 125  174 174 174  174 174 174  166 165 166
++156 155 156  153 152 153  137 136 137  137 136 137  131 129 131  137 136 137
++137 136 137  137 136 137  60 74 84  30 32 34  4 0 0  4 0 0
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  6 6 6  4 0 0  4 0 0  6 6 6  26 28 28
++125 124 125  174 174 174  220 221 221  220 221 221  220 221 221  193 200 203
++205 212 215  220 221 221  205 212 215  220 221 221  220 221 221  244 246 246
++193 200 203  60 74 84  13 16 17  4 0 0  0 0 0  3 3 3
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 5  3 3 3
++1 1 2  3 3 3  4 4 5  4 4 5  4 4 4  4 4 4
++5 5 5  5 5 5  2 2 2  0 0 0  0 0 0  13 16 17
++60 74 84  174 174 174  193 200 203  174 174 174  167 166 167  163 162 163
++153 152 153  153 152 153  137 136 137  137 136 137  153 152 153  137 136 137
++125 124 125  41 54 63  24 26 27  4 0 0  4 0 0  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++6 6 6  37 38 37  131 129 131  220 221 221  220 221 221  220 221 221
++193 200 203  193 200 203  220 221 221  205 212 215  220 221 221  244 246 246
++244 246 246  244 246 246  174 174 174  41 54 63  0 0 0  0 0 0
++0 0 0  4 4 4  5 5 5  5 5 5  4 4 4  4 4 5
++4 4 5  4 4 5  4 4 4  4 4 4  6 6 6  6 6 6
++3 3 3  0 0 0  2 0 0  13 16 17  60 73 81  156 155 156
++220 221 221  193 200 203  174 174 174  165 164 165  163 162 163  154 153 154
++153 152 153  153 152 153  158 157 158  163 162 163  137 136 137  60 73 81
++13 16 17  4 0 0  4 0 0  4 3 3  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  4 3 3  6 6 6  6 6 6  6 6 6
++6 6 6  6 6 6  6 6 6  37 38 37  167 166 167  244 246 246
++244 246 246  220 221 221  205 212 215  205 212 215  220 221 221  193 200 203
++220 221 221  244 246 246  244 246 246  244 246 246  137 136 137  37 38 37
++3 2 2  0 0 0  1 1 1  5 5 5  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 4 4  1 1 1
++0 0 0  5 5 5  43 57 68  153 152 153  193 200 203  220 221 221
++177 184 187  174 174 174  167 166 167  166 165 166  158 157 158  157 156 157
++158 157 158  166 165 166  156 155 156  85 115 134  13 16 17  4 0 0
++4 0 0  4 0 0  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  6 6 6  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  6 6 6  6 6 6  13 16 17  60 73 81
++177 184 187  220 221 221  220 221 221  220 221 221  205 212 215  220 221 221
++220 221 221  205 212 215  220 221 221  244 246 246  244 246 246  205 212 215
++125 124 125  30 32 34  0 0 0  0 0 0  2 2 2  5 5 5
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  1 0 0
++37 38 37  131 129 131  205 212 215  220 221 221  193 200 203  174 174 174
++174 174 174  174 174 174  167 166 167  165 164 165  166 165 166  167 166 167
++158 157 158  125 124 125  37 38 37  4 0 0  4 0 0  4 0 0
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  4 3 3  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++26 28 28  125 124 125  205 212 215  220 221 221  220 221 221  220 221 221
++205 212 215  220 221 221  205 212 215  220 221 221  220 221 221  244 246 246
++244 246 246  190 197 201  60 74 84  16 19 21  4 0 0  0 0 0
++0 0 0  0 0 0  0 0 0  0 0 0  16 19 21  120 125 127
++177 184 187  220 221 221  205 212 215  177 184 187  174 174 174  177 184 187
++174 174 174  174 174 174  167 166 167  174 174 174  166 165 166  137 136 137
++60 73 81  13 16 17  4 0 0  4 0 0  4 3 3  6 6 6
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  5 5 5  4 3 3  6 6 6  4 0 0
++6 6 6  6 6 6  4 0 0  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  37 38 37  137 136 137  193 200 203  220 221 221
++220 221 221  205 212 215  220 221 221  205 212 215  205 212 215  220 221 221
++220 221 221  220 221 221  244 246 246  166 165 166  43 57 68  2 2 2
++0 0 0  4 0 0  16 19 21  60 73 81  157 156 157  202 210 214
++220 221 221  193 200 203  177 184 187  177 184 187  177 184 187  174 174 174
++174 174 174  174 174 174  174 174 174  157 156 157  60 74 84  24 26 27
++4 0 0  4 0 0  4 0 0  6 6 6  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  4 3 3  5 5 5  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  6 6 6  4 0 0
++4 0 0  4 0 0  6 6 6  24 26 27  60 73 81  167 166 167
++220 221 221  220 221 221  220 221 221  205 212 215  205 212 215  205 212 215
++205 212 215  220 221 221  220 221 221  220 221 221  205 212 215  137 136 137
++60 74 84  125 124 125  137 136 137  190 197 201  220 221 221  193 200 203
++177 184 187  177 184 187  177 184 187  174 174 174  174 174 174  177 184 187
++190 197 201  174 174 174  125 124 125  37 38 37  6 6 6  4 0 0
++4 0 0  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  4 3 3  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  4 0 0  4 0 0  6 6 6  6 6 6
++125 124 125  193 200 203  244 246 246  220 221 221  205 212 215  205 212 215
++205 212 215  193 200 203  205 212 215  205 212 215  220 221 221  220 221 221
++193 200 203  193 200 203  205 212 215  193 200 203  193 200 203  177 184 187
++190 197 201  190 197 201  174 174 174  190 197 201  193 200 203  190 197 201
++153 152 153  60 73 81  4 0 0  4 0 0  4 0 0  3 2 2
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  4 3 3
++6 6 6  4 3 3  4 3 3  4 3 3  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  4 0 0  4 0 0
++4 0 0  26 28 28  131 129 131  220 221 221  244 246 246  220 221 221
++205 212 215  193 200 203  205 212 215  193 200 203  193 200 203  205 212 215
++220 221 221  193 200 203  193 200 203  193 200 203  190 197 201  174 174 174
++174 174 174  190 197 201  193 200 203  193 200 203  167 166 167  125 124 125
++6 6 6  4 0 0  4 0 0  4 3 3  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++5 5 5  4 3 3  5 5 5  6 6 6  4 3 3  5 5 5
++6 6 6  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++4 0 0  4 0 0  6 6 6  41 54 63  158 157 158  220 221 221
++220 221 221  220 221 221  193 200 203  193 200 203  193 200 203  190 197 201
++190 197 201  190 197 201  190 197 201  190 197 201  174 174 174  193 200 203
++193 200 203  220 221 221  174 174 174  125 124 125  37 38 37  4 0 0
++4 0 0  4 3 3  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  4 3 3  4 3 3  5 5 5
++4 3 3  6 6 6  5 5 5  4 3 3  6 6 6  6 6 6
++6 6 6  6 6 6  4 0 0  4 0 0  13 16 17  60 73 81
++174 174 174  220 221 221  220 221 221  205 212 215  190 197 201  174 174 174
++193 200 203  174 174 174  190 197 201  174 174 174  193 200 203  220 221 221
++193 200 203  131 129 131  37 38 37  6 6 6  4 0 0  4 0 0
++6 6 6  6 6 6  4 3 3  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
++5 5 5  4 3 3  4 3 3  5 5 5  4 3 3  4 3 3
++5 5 5  6 6 6  6 6 6  4 0 0  6 6 6  6 6 6
++6 6 6  125 124 125  174 174 174  220 221 221  220 221 221  193 200 203
++193 200 203  193 200 203  193 200 203  193 200 203  220 221 221  158 157 158
++60 73 81  6 6 6  4 0 0  4 0 0  5 5 5  6 6 6
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  5 5 5  4 3 3  5 5 5  4 3 3
++5 5 5  5 5 5  6 6 6  6 6 6  4 0 0  4 0 0
++4 0 0  4 0 0  26 28 28  125 124 125  174 174 174  193 200 203
++193 200 203  174 174 174  193 200 203  167 166 167  125 124 125  6 6 6
++6 6 6  6 6 6  4 0 0  6 6 6  6 6 6  5 5 5
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++4 3 3  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++6 6 6  4 0 0  4 0 0  6 6 6  37 38 37  125 124 125
++153 152 153  131 129 131  125 124 125  37 38 37  6 6 6  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  4 3 3  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  5 5 5  4 3 3  5 5 5  4 3 3
++6 6 6  6 6 6  4 0 0  4 0 0  6 6 6  6 6 6
++24 26 27  24 26 27  6 6 6  6 6 6  6 6 6  4 0 0
++6 6 6  6 6 6  4 0 0  6 6 6  5 5 5  4 3 3
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  4 3 3  5 5 5  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++6 6 6  6 6 6  6 6 6  4 0 0  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  4 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  5 5 5
++5 5 5  5 5 5  4 0 0  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  6 6 6  4 0 0  6 6 6  4 0 0
++6 6 6  4 3 3  5 5 5  4 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++4 3 3  6 6 6  4 3 3  6 6 6  6 6 6  6 6 6
++4 0 0  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++6 6 6  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  5 5 5  4 0 0  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  4 0 0  6 6 6
++4 3 3  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  5 5 5  6 6 6  4 3 3
++4 3 3  6 6 6  6 6 6  4 3 3  6 6 6  4 3 3
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  6 6 6
++5 5 5  4 3 3  4 3 3  4 3 3  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  4 3 3
++5 5 5  4 3 3  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
+diff -urNp linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/nvidia/nv_backlight.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
  	return bd->props.brightness;
  }
@@ -38389,9 +41146,9 @@ diff -urNp linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c linux-2.6.32.45/d
  	.get_brightness = nvidia_bl_get_brightness,
  	.update_status	= nvidia_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/riva/fbdev.c linux-2.6.32.45/drivers/video/riva/fbdev.c
---- linux-2.6.32.45/drivers/video/riva/fbdev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/riva/fbdev.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/riva/fbdev.c linux-2.6.32.46/drivers/video/riva/fbdev.c
+--- linux-2.6.32.46/drivers/video/riva/fbdev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/riva/fbdev.c	2011-04-17 15:56:46.000000000 -0400
 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
  	return bd->props.brightness;
  }
@@ -38401,9 +41158,9 @@ diff -urNp linux-2.6.32.45/drivers/video/riva/fbdev.c linux-2.6.32.45/drivers/vi
  	.get_brightness = riva_bl_get_brightness,
  	.update_status	= riva_bl_update_status,
  };
-diff -urNp linux-2.6.32.45/drivers/video/uvesafb.c linux-2.6.32.45/drivers/video/uvesafb.c
---- linux-2.6.32.45/drivers/video/uvesafb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/uvesafb.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/uvesafb.c linux-2.6.32.46/drivers/video/uvesafb.c
+--- linux-2.6.32.46/drivers/video/uvesafb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/uvesafb.c	2011-04-17 15:56:46.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/fb.h>
  #include <linux/io.h>
@@ -38479,9 +41236,9 @@ diff -urNp linux-2.6.32.45/drivers/video/uvesafb.c linux-2.6.32.45/drivers/video
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-2.6.32.45/drivers/video/vesafb.c linux-2.6.32.45/drivers/video/vesafb.c
---- linux-2.6.32.45/drivers/video/vesafb.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/video/vesafb.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/video/vesafb.c linux-2.6.32.46/drivers/video/vesafb.c
+--- linux-2.6.32.46/drivers/video/vesafb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/video/vesafb.c	2011-08-05 20:33:55.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -38584,9 +41341,9 @@ diff -urNp linux-2.6.32.45/drivers/video/vesafb.c linux-2.6.32.45/drivers/video/
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-2.6.32.45/drivers/xen/sys-hypervisor.c linux-2.6.32.45/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.45/drivers/xen/sys-hypervisor.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/drivers/xen/sys-hypervisor.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/drivers/xen/sys-hypervisor.c linux-2.6.32.46/drivers/xen/sys-hypervisor.c
+--- linux-2.6.32.46/drivers/xen/sys-hypervisor.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/xen/sys-hypervisor.c	2011-04-17 15:56:46.000000000 -0400
 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
  	return 0;
  }
@@ -38596,9 +41353,9 @@ diff -urNp linux-2.6.32.45/drivers/xen/sys-hypervisor.c linux-2.6.32.45/drivers/
  	.show = hyp_sysfs_show,
  	.store = hyp_sysfs_store,
  };
-diff -urNp linux-2.6.32.45/fs/9p/vfs_inode.c linux-2.6.32.45/fs/9p/vfs_inode.c
---- linux-2.6.32.45/fs/9p/vfs_inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/9p/vfs_inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/9p/vfs_inode.c linux-2.6.32.46/fs/9p/vfs_inode.c
+--- linux-2.6.32.46/fs/9p/vfs_inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/9p/vfs_inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
  static void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -38608,9 +41365,9 @@ diff -urNp linux-2.6.32.45/fs/9p/vfs_inode.c linux-2.6.32.45/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.32.45/fs/aio.c linux-2.6.32.45/fs/aio.c
---- linux-2.6.32.45/fs/aio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/aio.c	2011-06-04 20:40:21.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/aio.c linux-2.6.32.46/fs/aio.c
+--- linux-2.6.32.46/fs/aio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/aio.c	2011-06-04 20:40:21.000000000 -0400
 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -38649,9 +41406,9 @@ diff -urNp linux-2.6.32.45/fs/aio.c linux-2.6.32.45/fs/aio.c
  	kiocb->ki_nr_segs = kiocb->ki_nbytes;
  	kiocb->ki_cur_seg = 0;
  	/* ki_nbytes/left now reflect bytes instead of segs */
-diff -urNp linux-2.6.32.45/fs/attr.c linux-2.6.32.45/fs/attr.c
---- linux-2.6.32.45/fs/attr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/attr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/attr.c linux-2.6.32.46/fs/attr.c
+--- linux-2.6.32.46/fs/attr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/attr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
@@ -38660,9 +41417,9 @@ diff -urNp linux-2.6.32.45/fs/attr.c linux-2.6.32.45/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.32.45/fs/autofs/root.c linux-2.6.32.45/fs/autofs/root.c
---- linux-2.6.32.45/fs/autofs/root.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/autofs/root.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/autofs/root.c linux-2.6.32.46/fs/autofs/root.c
+--- linux-2.6.32.46/fs/autofs/root.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/autofs/root.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
  	set_bit(n,sbi->symlink_bitmap);
  	sl = &sbi->symlink[n];
@@ -38673,9 +41430,9 @@ diff -urNp linux-2.6.32.45/fs/autofs/root.c linux-2.6.32.45/fs/autofs/root.c
  	if (!sl->data) {
  		clear_bit(n,sbi->symlink_bitmap);
  		unlock_kernel();
-diff -urNp linux-2.6.32.45/fs/autofs4/symlink.c linux-2.6.32.45/fs/autofs4/symlink.c
---- linux-2.6.32.45/fs/autofs4/symlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/autofs4/symlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/autofs4/symlink.c linux-2.6.32.46/fs/autofs4/symlink.c
+--- linux-2.6.32.46/fs/autofs4/symlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/autofs4/symlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,7 @@
  static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
@@ -38685,10 +41442,10 @@ diff -urNp linux-2.6.32.45/fs/autofs4/symlink.c linux-2.6.32.45/fs/autofs4/symli
  	return NULL;
  }
  
-diff -urNp linux-2.6.32.45/fs/befs/linuxvfs.c linux-2.6.32.45/fs/befs/linuxvfs.c
---- linux-2.6.32.45/fs/befs/linuxvfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/befs/linuxvfs.c	2011-04-17 15:56:46.000000000 -0400
-@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 
+diff -urNp linux-2.6.32.46/fs/befs/linuxvfs.c linux-2.6.32.46/fs/befs/linuxvfs.c
+--- linux-2.6.32.46/fs/befs/linuxvfs.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/fs/befs/linuxvfs.c	2011-08-29 22:25:07.000000000 -0400
+@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
  	if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
@@ -38697,9 +41454,9 @@ diff -urNp linux-2.6.32.45/fs/befs/linuxvfs.c linux-2.6.32.45/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-2.6.32.45/fs/binfmt_aout.c linux-2.6.32.45/fs/binfmt_aout.c
---- linux-2.6.32.45/fs/binfmt_aout.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/binfmt_aout.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/binfmt_aout.c linux-2.6.32.46/fs/binfmt_aout.c
+--- linux-2.6.32.46/fs/binfmt_aout.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/binfmt_aout.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -38787,9 +41544,9 @@ diff -urNp linux-2.6.32.45/fs/binfmt_aout.c linux-2.6.32.45/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.32.45/fs/binfmt_elf.c linux-2.6.32.45/fs/binfmt_elf.c
---- linux-2.6.32.45/fs/binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/binfmt_elf.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/binfmt_elf.c linux-2.6.32.46/fs/binfmt_elf.c
+--- linux-2.6.32.46/fs/binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/binfmt_elf.c	2011-05-16 21:46:57.000000000 -0400
 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
  #define elf_core_dump	NULL
  #endif
@@ -39463,9 +42220,9 @@ diff -urNp linux-2.6.32.45/fs/binfmt_elf.c linux-2.6.32.45/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-2.6.32.45/fs/binfmt_flat.c linux-2.6.32.45/fs/binfmt_flat.c
---- linux-2.6.32.45/fs/binfmt_flat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/binfmt_flat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/binfmt_flat.c linux-2.6.32.46/fs/binfmt_flat.c
+--- linux-2.6.32.46/fs/binfmt_flat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/binfmt_flat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
@@ -39498,9 +42255,9 @@ diff -urNp linux-2.6.32.45/fs/binfmt_flat.c linux-2.6.32.45/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-2.6.32.45/fs/bio.c linux-2.6.32.45/fs/bio.c
---- linux-2.6.32.45/fs/bio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/bio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/bio.c linux-2.6.32.46/fs/bio.c
+--- linux-2.6.32.46/fs/bio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/bio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
  
  	i = 0;
@@ -39519,9 +42276,9 @@ diff -urNp linux-2.6.32.45/fs/bio.c linux-2.6.32.45/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.32.45/fs/block_dev.c linux-2.6.32.45/fs/block_dev.c
---- linux-2.6.32.45/fs/block_dev.c	2011-08-09 18:35:29.000000000 -0400
-+++ linux-2.6.32.45/fs/block_dev.c	2011-08-09 18:34:00.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/block_dev.c linux-2.6.32.46/fs/block_dev.c
+--- linux-2.6.32.46/fs/block_dev.c	2011-08-09 18:35:29.000000000 -0400
++++ linux-2.6.32.46/fs/block_dev.c	2011-08-09 18:34:00.000000000 -0400
 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, 
  	else if (bdev->bd_contains == bdev)
  		res = 0;  	 /* is a whole device which isn't held */
@@ -39531,9 +42288,9 @@ diff -urNp linux-2.6.32.45/fs/block_dev.c linux-2.6.32.45/fs/block_dev.c
  		res = 0; 	 /* is a partition of a device that is being partitioned */
  	else if (bdev->bd_contains->bd_holder != NULL)
  		res = -EBUSY;	 /* is a partition of a held device */
-diff -urNp linux-2.6.32.45/fs/btrfs/ctree.c linux-2.6.32.45/fs/btrfs/ctree.c
---- linux-2.6.32.45/fs/btrfs/ctree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/ctree.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/ctree.c linux-2.6.32.46/fs/btrfs/ctree.c
+--- linux-2.6.32.46/fs/btrfs/ctree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/ctree.c	2011-04-17 15:56:46.000000000 -0400
 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
@@ -39558,9 +42315,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/ctree.c linux-2.6.32.45/fs/btrfs/ctree.c
  		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
  		ret = fixup_low_keys(trans, root, path, &disk_key, 1);
  	}
-diff -urNp linux-2.6.32.45/fs/btrfs/disk-io.c linux-2.6.32.45/fs/btrfs/disk-io.c
---- linux-2.6.32.45/fs/btrfs/disk-io.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/disk-io.c	2011-04-17 17:03:11.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/disk-io.c linux-2.6.32.46/fs/btrfs/disk-io.c
+--- linux-2.6.32.46/fs/btrfs/disk-io.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/disk-io.c	2011-04-17 17:03:11.000000000 -0400
 @@ -39,7 +39,7 @@
  #include "tree-log.h"
  #include "free-space-cache.h"
@@ -39579,9 +42336,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/disk-io.c linux-2.6.32.45/fs/btrfs/disk-io.c
  	.write_cache_pages_lock_hook = btree_lock_page_hook,
  	.readpage_end_io_hook = btree_readpage_end_io_hook,
  	.submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.32.45/fs/btrfs/extent_io.h linux-2.6.32.45/fs/btrfs/extent_io.h
---- linux-2.6.32.45/fs/btrfs/extent_io.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/extent_io.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/extent_io.h linux-2.6.32.46/fs/btrfs/extent_io.h
+--- linux-2.6.32.46/fs/btrfs/extent_io.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/extent_io.h	2011-04-17 15:56:46.000000000 -0400
 @@ -49,36 +49,36 @@ typedef	int (extent_submit_bio_hook_t)(s
  				       struct bio *bio, int mirror_num,
  				       unsigned long bio_flags);
@@ -39642,9 +42399,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/extent_io.h linux-2.6.32.45/fs/btrfs/extent_
  };
  
  struct extent_state {
-diff -urNp linux-2.6.32.45/fs/btrfs/extent-tree.c linux-2.6.32.45/fs/btrfs/extent-tree.c
---- linux-2.6.32.45/fs/btrfs/extent-tree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/extent-tree.c	2011-06-12 06:39:08.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/extent-tree.c linux-2.6.32.46/fs/btrfs/extent-tree.c
+--- linux-2.6.32.46/fs/btrfs/extent-tree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/extent-tree.c	2011-06-12 06:39:08.000000000 -0400
 @@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(
  				u64 group_start = group->key.objectid;
  				new_extents = kmalloc(sizeof(*new_extents),
@@ -39656,9 +42413,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/extent-tree.c linux-2.6.32.45/fs/btrfs/exten
  				nr_extents = 1;
  				ret = get_new_locations(reloc_inode,
  							extent_key,
-diff -urNp linux-2.6.32.45/fs/btrfs/free-space-cache.c linux-2.6.32.45/fs/btrfs/free-space-cache.c
---- linux-2.6.32.45/fs/btrfs/free-space-cache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/free-space-cache.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/free-space-cache.c linux-2.6.32.46/fs/btrfs/free-space-cache.c
+--- linux-2.6.32.46/fs/btrfs/free-space-cache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/free-space-cache.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
  
  	while(1) {
@@ -39677,9 +42434,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/free-space-cache.c linux-2.6.32.45/fs/btrfs/
  
  		if (entry->bitmap && entry->bytes > bytes + empty_size) {
  			ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.32.45/fs/btrfs/inode.c linux-2.6.32.45/fs/btrfs/inode.c
---- linux-2.6.32.45/fs/btrfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/inode.c	2011-06-12 06:39:58.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/inode.c linux-2.6.32.46/fs/btrfs/inode.c
+--- linux-2.6.32.46/fs/btrfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/inode.c	2011-06-12 06:39:58.000000000 -0400
 @@ -63,7 +63,7 @@ static const struct inode_operations btr
  static const struct address_space_operations btrfs_aops;
  static const struct address_space_operations btrfs_symlink_aops;
@@ -39739,9 +42496,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/inode.c linux-2.6.32.45/fs/btrfs/inode.c
  	.fill_delalloc = run_delalloc_range,
  	.submit_bio_hook = btrfs_submit_bio_hook,
  	.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.32.45/fs/btrfs/relocation.c linux-2.6.32.45/fs/btrfs/relocation.c
---- linux-2.6.32.45/fs/btrfs/relocation.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/relocation.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/relocation.c linux-2.6.32.46/fs/btrfs/relocation.c
+--- linux-2.6.32.46/fs/btrfs/relocation.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/relocation.c	2011-04-17 15:56:46.000000000 -0400
 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
@@ -39751,9 +42508,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/relocation.c linux-2.6.32.45/fs/btrfs/reloca
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.32.45/fs/btrfs/sysfs.c linux-2.6.32.45/fs/btrfs/sysfs.c
---- linux-2.6.32.45/fs/btrfs/sysfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/btrfs/sysfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/btrfs/sysfs.c linux-2.6.32.46/fs/btrfs/sysfs.c
+--- linux-2.6.32.46/fs/btrfs/sysfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/sysfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
  	complete(&root->kobj_unregister);
  }
@@ -39769,9 +42526,9 @@ diff -urNp linux-2.6.32.45/fs/btrfs/sysfs.c linux-2.6.32.45/fs/btrfs/sysfs.c
  	.show	= btrfs_root_attr_show,
  	.store	= btrfs_root_attr_store,
  };
-diff -urNp linux-2.6.32.45/fs/buffer.c linux-2.6.32.45/fs/buffer.c
---- linux-2.6.32.45/fs/buffer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/buffer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/buffer.c linux-2.6.32.46/fs/buffer.c
+--- linux-2.6.32.46/fs/buffer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/buffer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/percpu.h>
  #include <linux/slab.h>
@@ -39780,9 +42537,9 @@ diff -urNp linux-2.6.32.45/fs/buffer.c linux-2.6.32.45/fs/buffer.c
  #include <linux/blkdev.h>
  #include <linux/file.h>
  #include <linux/quotaops.h>
-diff -urNp linux-2.6.32.45/fs/cachefiles/bind.c linux-2.6.32.45/fs/cachefiles/bind.c
---- linux-2.6.32.45/fs/cachefiles/bind.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cachefiles/bind.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cachefiles/bind.c linux-2.6.32.46/fs/cachefiles/bind.c
+--- linux-2.6.32.46/fs/cachefiles/bind.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cachefiles/bind.c	2011-04-17 15:56:46.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -39799,9 +42556,9 @@ diff -urNp linux-2.6.32.45/fs/cachefiles/bind.c linux-2.6.32.45/fs/cachefiles/bi
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-2.6.32.45/fs/cachefiles/daemon.c linux-2.6.32.45/fs/cachefiles/daemon.c
---- linux-2.6.32.45/fs/cachefiles/daemon.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cachefiles/daemon.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cachefiles/daemon.c linux-2.6.32.46/fs/cachefiles/daemon.c
+--- linux-2.6.32.46/fs/cachefiles/daemon.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cachefiles/daemon.c	2011-04-17 15:56:46.000000000 -0400
 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
  	if (test_bit(CACHEFILES_DEAD, &cache->flags))
  		return -EIO;
@@ -39829,9 +42586,9 @@ diff -urNp linux-2.6.32.45/fs/cachefiles/daemon.c linux-2.6.32.45/fs/cachefiles/
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-2.6.32.45/fs/cachefiles/internal.h linux-2.6.32.45/fs/cachefiles/internal.h
---- linux-2.6.32.45/fs/cachefiles/internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cachefiles/internal.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cachefiles/internal.h linux-2.6.32.46/fs/cachefiles/internal.h
+--- linux-2.6.32.46/fs/cachefiles/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cachefiles/internal.h	2011-05-04 17:56:28.000000000 -0400
 @@ -56,7 +56,7 @@ struct cachefiles_cache {
  	wait_queue_head_t		daemon_pollwq;	/* poll waitqueue for daemon */
  	struct rb_root			active_nodes;	/* active nodes (can't be culled) */
@@ -39866,9 +42623,9 @@ diff -urNp linux-2.6.32.45/fs/cachefiles/internal.h linux-2.6.32.45/fs/cachefile
  }
  
  #else
-diff -urNp linux-2.6.32.45/fs/cachefiles/namei.c linux-2.6.32.45/fs/cachefiles/namei.c
---- linux-2.6.32.45/fs/cachefiles/namei.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cachefiles/namei.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cachefiles/namei.c linux-2.6.32.46/fs/cachefiles/namei.c
+--- linux-2.6.32.46/fs/cachefiles/namei.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cachefiles/namei.c	2011-05-04 17:56:28.000000000 -0400
 @@ -250,7 +250,7 @@ try_again:
  	/* first step is to make up a grave dentry in the graveyard */
  	sprintf(nbuffer, "%08x%08x",
@@ -39878,9 +42635,9 @@ diff -urNp linux-2.6.32.45/fs/cachefiles/namei.c linux-2.6.32.45/fs/cachefiles/n
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-2.6.32.45/fs/cachefiles/proc.c linux-2.6.32.45/fs/cachefiles/proc.c
---- linux-2.6.32.45/fs/cachefiles/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cachefiles/proc.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cachefiles/proc.c linux-2.6.32.46/fs/cachefiles/proc.c
+--- linux-2.6.32.46/fs/cachefiles/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cachefiles/proc.c	2011-05-04 17:56:28.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -39907,9 +42664,9 @@ diff -urNp linux-2.6.32.45/fs/cachefiles/proc.c linux-2.6.32.45/fs/cachefiles/pr
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff -urNp linux-2.6.32.45/fs/cachefiles/rdwr.c linux-2.6.32.45/fs/cachefiles/rdwr.c
---- linux-2.6.32.45/fs/cachefiles/rdwr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cachefiles/rdwr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cachefiles/rdwr.c linux-2.6.32.46/fs/cachefiles/rdwr.c
+--- linux-2.6.32.46/fs/cachefiles/rdwr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cachefiles/rdwr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -39919,9 +42676,9 @@ diff -urNp linux-2.6.32.45/fs/cachefiles/rdwr.c linux-2.6.32.45/fs/cachefiles/rd
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-2.6.32.45/fs/cifs/cifs_debug.c linux-2.6.32.45/fs/cifs/cifs_debug.c
---- linux-2.6.32.45/fs/cifs/cifs_debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cifs/cifs_debug.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cifs/cifs_debug.c linux-2.6.32.46/fs/cifs/cifs_debug.c
+--- linux-2.6.32.46/fs/cifs/cifs_debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cifs/cifs_debug.c	2011-05-04 17:56:28.000000000 -0400
 @@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(str
  					tcon = list_entry(tmp3,
  							  struct cifsTconInfo,
@@ -40029,9 +42786,9 @@ diff -urNp linux-2.6.32.45/fs/cifs/cifs_debug.c linux-2.6.32.45/fs/cifs/cifs_deb
  			}
  		}
  	}
-diff -urNp linux-2.6.32.45/fs/cifs/cifsfs.c linux-2.6.32.45/fs/cifs/cifsfs.c
---- linux-2.6.32.45/fs/cifs/cifsfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cifs/cifsfs.c	2011-08-25 17:17:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cifs/cifsfs.c linux-2.6.32.46/fs/cifs/cifsfs.c
+--- linux-2.6.32.46/fs/cifs/cifsfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cifs/cifsfs.c	2011-08-25 17:17:57.000000000 -0400
 @@ -869,7 +869,7 @@ cifs_init_request_bufs(void)
  	cifs_req_cachep = kmem_cache_create("cifs_request",
  					    CIFSMaxBufSize +
@@ -40061,9 +42818,9 @@ diff -urNp linux-2.6.32.45/fs/cifs/cifsfs.c linux-2.6.32.45/fs/cifs/cifsfs.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	atomic_set(&midCount, 0);
-diff -urNp linux-2.6.32.45/fs/cifs/cifsglob.h linux-2.6.32.45/fs/cifs/cifsglob.h
---- linux-2.6.32.45/fs/cifs/cifsglob.h	2011-08-09 18:35:29.000000000 -0400
-+++ linux-2.6.32.45/fs/cifs/cifsglob.h	2011-08-25 17:17:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cifs/cifsglob.h linux-2.6.32.46/fs/cifs/cifsglob.h
+--- linux-2.6.32.46/fs/cifs/cifsglob.h	2011-08-09 18:35:29.000000000 -0400
++++ linux-2.6.32.46/fs/cifs/cifsglob.h	2011-08-25 17:17:57.000000000 -0400
 @@ -252,28 +252,28 @@ struct cifsTconInfo {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
@@ -40135,9 +42892,9 @@ diff -urNp linux-2.6.32.45/fs/cifs/cifsglob.h linux-2.6.32.45/fs/cifs/cifsglob.h
  #endif
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
-diff -urNp linux-2.6.32.45/fs/cifs/link.c linux-2.6.32.45/fs/cifs/link.c
---- linux-2.6.32.45/fs/cifs/link.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cifs/link.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cifs/link.c linux-2.6.32.46/fs/cifs/link.c
+--- linux-2.6.32.46/fs/cifs/link.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cifs/link.c	2011-04-17 15:56:46.000000000 -0400
 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -40147,9 +42904,9 @@ diff -urNp linux-2.6.32.45/fs/cifs/link.c linux-2.6.32.45/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-2.6.32.45/fs/cifs/misc.c linux-2.6.32.45/fs/cifs/misc.c
---- linux-2.6.32.45/fs/cifs/misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/cifs/misc.c	2011-08-25 17:17:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/cifs/misc.c linux-2.6.32.46/fs/cifs/misc.c
+--- linux-2.6.32.46/fs/cifs/misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cifs/misc.c	2011-08-25 17:17:57.000000000 -0400
 @@ -155,7 +155,7 @@ cifs_buf_get(void)
  		memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
  		atomic_inc(&bufAllocCount);
@@ -40168,9 +42925,9 @@ diff -urNp linux-2.6.32.45/fs/cifs/misc.c linux-2.6.32.45/fs/cifs/misc.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	}
-diff -urNp linux-2.6.32.45/fs/coda/cache.c linux-2.6.32.45/fs/coda/cache.c
---- linux-2.6.32.45/fs/coda/cache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/coda/cache.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/coda/cache.c linux-2.6.32.46/fs/coda/cache.c
+--- linux-2.6.32.46/fs/coda/cache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/coda/cache.c	2011-05-04 17:56:28.000000000 -0400
 @@ -24,14 +24,14 @@
  #include <linux/coda_fs_i.h>
  #include <linux/coda_cache.h>
@@ -40213,9 +42970,9 @@ diff -urNp linux-2.6.32.45/fs/coda/cache.c linux-2.6.32.45/fs/coda/cache.c
  
          return hit;
  }
-diff -urNp linux-2.6.32.45/fs/compat_binfmt_elf.c linux-2.6.32.45/fs/compat_binfmt_elf.c
---- linux-2.6.32.45/fs/compat_binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/compat_binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/compat_binfmt_elf.c linux-2.6.32.46/fs/compat_binfmt_elf.c
+--- linux-2.6.32.46/fs/compat_binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/compat_binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,10 +29,12 @@
  #undef	elfhdr
  #undef	elf_phdr
@@ -40229,9 +42986,9 @@ diff -urNp linux-2.6.32.45/fs/compat_binfmt_elf.c linux-2.6.32.45/fs/compat_binf
  #define elf_addr_t	Elf32_Addr
  
  /*
-diff -urNp linux-2.6.32.45/fs/compat.c linux-2.6.32.45/fs/compat.c
---- linux-2.6.32.45/fs/compat.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/fs/compat.c	2011-08-11 19:56:56.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/compat.c linux-2.6.32.46/fs/compat.c
+--- linux-2.6.32.46/fs/compat.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/fs/compat.c	2011-08-11 19:56:56.000000000 -0400
 @@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
  
  struct compat_readdir_callback {
@@ -40440,9 +43197,9 @@ diff -urNp linux-2.6.32.45/fs/compat.c linux-2.6.32.45/fs/compat.c
  	if (n < 0)
  		goto out_nofds;
  
-diff -urNp linux-2.6.32.45/fs/compat_ioctl.c linux-2.6.32.45/fs/compat_ioctl.c
---- linux-2.6.32.45/fs/compat_ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/compat_ioctl.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/compat_ioctl.c linux-2.6.32.46/fs/compat_ioctl.c
+--- linux-2.6.32.46/fs/compat_ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/compat_ioctl.c	2011-04-23 12:56:11.000000000 -0400
 @@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsi
  	up = (struct compat_video_spu_palette __user *) arg;
  	err  = get_user(palp, &up->palette);
@@ -40452,9 +43209,9 @@ diff -urNp linux-2.6.32.45/fs/compat_ioctl.c linux-2.6.32.45/fs/compat_ioctl.c
  
  	up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
  	err  = put_user(compat_ptr(palp), &up_native->palette);
-diff -urNp linux-2.6.32.45/fs/configfs/dir.c linux-2.6.32.45/fs/configfs/dir.c
---- linux-2.6.32.45/fs/configfs/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/configfs/dir.c	2011-05-11 18:25:15.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/configfs/dir.c linux-2.6.32.46/fs/configfs/dir.c
+--- linux-2.6.32.46/fs/configfs/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/configfs/dir.c	2011-05-11 18:25:15.000000000 -0400
 @@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file 
  			}
  			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -40479,9 +43236,9 @@ diff -urNp linux-2.6.32.45/fs/configfs/dir.c linux-2.6.32.45/fs/configfs/dir.c
  				if (next->s_dentry)
  					ino = next->s_dentry->d_inode->i_ino;
  				else
-diff -urNp linux-2.6.32.45/fs/dcache.c linux-2.6.32.45/fs/dcache.c
---- linux-2.6.32.45/fs/dcache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/dcache.c	2011-04-23 13:32:21.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/dcache.c linux-2.6.32.46/fs/dcache.c
+--- linux-2.6.32.46/fs/dcache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/dcache.c	2011-04-23 13:32:21.000000000 -0400
 @@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock);
  
  static struct kmem_cache *dentry_cache __read_mostly;
@@ -40500,9 +43257,9 @@ diff -urNp linux-2.6.32.45/fs/dcache.c linux-2.6.32.45/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-2.6.32.45/fs/dlm/lockspace.c linux-2.6.32.45/fs/dlm/lockspace.c
---- linux-2.6.32.45/fs/dlm/lockspace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/dlm/lockspace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/dlm/lockspace.c linux-2.6.32.46/fs/dlm/lockspace.c
+--- linux-2.6.32.46/fs/dlm/lockspace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/dlm/lockspace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
  	kfree(ls);
  }
@@ -40512,9 +43269,9 @@ diff -urNp linux-2.6.32.45/fs/dlm/lockspace.c linux-2.6.32.45/fs/dlm/lockspace.c
  	.show  = dlm_attr_show,
  	.store = dlm_attr_store,
  };
-diff -urNp linux-2.6.32.45/fs/ecryptfs/inode.c linux-2.6.32.45/fs/ecryptfs/inode.c
---- linux-2.6.32.45/fs/ecryptfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ecryptfs/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ecryptfs/inode.c linux-2.6.32.46/fs/ecryptfs/inode.c
+--- linux-2.6.32.46/fs/ecryptfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ecryptfs/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -40533,9 +43290,9 @@ diff -urNp linux-2.6.32.45/fs/ecryptfs/inode.c linux-2.6.32.45/fs/ecryptfs/inode
  	set_fs(old_fs);
  	if (rc < 0)
  		goto out_free;
-diff -urNp linux-2.6.32.45/fs/exec.c linux-2.6.32.45/fs/exec.c
---- linux-2.6.32.45/fs/exec.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/fs/exec.c	2011-08-11 19:56:19.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/exec.c linux-2.6.32.46/fs/exec.c
+--- linux-2.6.32.46/fs/exec.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/fs/exec.c	2011-08-11 19:56:19.000000000 -0400
 @@ -56,12 +56,24 @@
  #include <linux/fsnotify.h>
  #include <linux/fs_struct.h>
@@ -41129,9 +43886,9 @@ diff -urNp linux-2.6.32.45/fs/exec.c linux-2.6.32.45/fs/exec.c
  fail_unlock:
  	if (helper_argv)
  		argv_free(helper_argv);
-diff -urNp linux-2.6.32.45/fs/ext2/balloc.c linux-2.6.32.45/fs/ext2/balloc.c
---- linux-2.6.32.45/fs/ext2/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ext2/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ext2/balloc.c linux-2.6.32.46/fs/ext2/balloc.c
+--- linux-2.6.32.46/fs/ext2/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ext2/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -41141,9 +43898,9 @@ diff -urNp linux-2.6.32.45/fs/ext2/balloc.c linux-2.6.32.45/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.32.45/fs/ext3/balloc.c linux-2.6.32.45/fs/ext3/balloc.c
---- linux-2.6.32.45/fs/ext3/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ext3/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ext3/balloc.c linux-2.6.32.46/fs/ext3/balloc.c
+--- linux-2.6.32.46/fs/ext3/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ext3/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -41153,9 +43910,9 @@ diff -urNp linux-2.6.32.45/fs/ext3/balloc.c linux-2.6.32.45/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-2.6.32.45/fs/ext4/balloc.c linux-2.6.32.45/fs/ext4/balloc.c
---- linux-2.6.32.45/fs/ext4/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ext4/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ext4/balloc.c linux-2.6.32.46/fs/ext4/balloc.c
+--- linux-2.6.32.46/fs/ext4/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ext4/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
  	/* Hm, nope.  Are (enough) root reserved blocks available? */
  	if (sbi->s_resuid == current_fsuid() ||
@@ -41165,9 +43922,9 @@ diff -urNp linux-2.6.32.45/fs/ext4/balloc.c linux-2.6.32.45/fs/ext4/balloc.c
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
  	}
-diff -urNp linux-2.6.32.45/fs/ext4/ext4.h linux-2.6.32.45/fs/ext4/ext4.h
---- linux-2.6.32.45/fs/ext4/ext4.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ext4/ext4.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ext4/ext4.h linux-2.6.32.46/fs/ext4/ext4.h
+--- linux-2.6.32.46/fs/ext4/ext4.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ext4/ext4.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1078,19 +1078,19 @@ struct ext4_sb_info {
  
  	/* stats for buddy allocator */
@@ -41198,9 +43955,9 @@ diff -urNp linux-2.6.32.45/fs/ext4/ext4.h linux-2.6.32.45/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-2.6.32.45/fs/ext4/mballoc.c linux-2.6.32.45/fs/ext4/mballoc.c
---- linux-2.6.32.45/fs/ext4/mballoc.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/fs/ext4/mballoc.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ext4/mballoc.c linux-2.6.32.46/fs/ext4/mballoc.c
+--- linux-2.6.32.46/fs/ext4/mballoc.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/fs/ext4/mballoc.c	2011-06-25 12:56:37.000000000 -0400
 @@ -1755,7 +1755,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
@@ -41323,9 +44080,9 @@ diff -urNp linux-2.6.32.45/fs/ext4/mballoc.c linux-2.6.32.45/fs/ext4/mballoc.c
  
  	if (ac) {
  		ac->ac_sb = sb;
-diff -urNp linux-2.6.32.45/fs/ext4/super.c linux-2.6.32.45/fs/ext4/super.c
---- linux-2.6.32.45/fs/ext4/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ext4/super.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ext4/super.c linux-2.6.32.46/fs/ext4/super.c
+--- linux-2.6.32.46/fs/ext4/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ext4/super.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
  }
  
@@ -41335,9 +44092,9 @@ diff -urNp linux-2.6.32.45/fs/ext4/super.c linux-2.6.32.45/fs/ext4/super.c
  	.show	= ext4_attr_show,
  	.store	= ext4_attr_store,
  };
-diff -urNp linux-2.6.32.45/fs/fcntl.c linux-2.6.32.45/fs/fcntl.c
---- linux-2.6.32.45/fs/fcntl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fcntl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fcntl.c linux-2.6.32.46/fs/fcntl.c
+--- linux-2.6.32.46/fs/fcntl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fcntl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -41358,9 +44115,9 @@ diff -urNp linux-2.6.32.45/fs/fcntl.c linux-2.6.32.45/fs/fcntl.c
  		if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
  			break;
  		err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-diff -urNp linux-2.6.32.45/fs/fifo.c linux-2.6.32.45/fs/fifo.c
---- linux-2.6.32.45/fs/fifo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fifo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fifo.c linux-2.6.32.46/fs/fifo.c
+--- linux-2.6.32.46/fs/fifo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fifo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
@@ -41431,9 +44188,9 @@ diff -urNp linux-2.6.32.45/fs/fifo.c linux-2.6.32.45/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-2.6.32.45/fs/file.c linux-2.6.32.45/fs/file.c
---- linux-2.6.32.45/fs/file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/file.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/file.c linux-2.6.32.46/fs/file.c
+--- linux-2.6.32.46/fs/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/file.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -41451,9 +44208,9 @@ diff -urNp linux-2.6.32.45/fs/file.c linux-2.6.32.45/fs/file.c
  	if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
  		return -EMFILE;
  
-diff -urNp linux-2.6.32.45/fs/filesystems.c linux-2.6.32.45/fs/filesystems.c
---- linux-2.6.32.45/fs/filesystems.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/filesystems.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/filesystems.c linux-2.6.32.46/fs/filesystems.c
+--- linux-2.6.32.46/fs/filesystems.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/filesystems.c	2011-04-17 15:56:46.000000000 -0400
 @@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
@@ -41467,9 +44224,9 @@ diff -urNp linux-2.6.32.45/fs/filesystems.c linux-2.6.32.45/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-2.6.32.45/fs/fscache/cookie.c linux-2.6.32.45/fs/fscache/cookie.c
---- linux-2.6.32.45/fs/fscache/cookie.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fscache/cookie.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fscache/cookie.c linux-2.6.32.46/fs/fscache/cookie.c
+--- linux-2.6.32.46/fs/fscache/cookie.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fscache/cookie.c	2011-05-04 17:56:28.000000000 -0400
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
  	       parent ? (char *) parent->def->name : "<no-parent>",
  	       def->name, netfs_data);
@@ -41588,9 +44345,9 @@ diff -urNp linux-2.6.32.45/fs/fscache/cookie.c linux-2.6.32.45/fs/fscache/cookie
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff -urNp linux-2.6.32.45/fs/fscache/internal.h linux-2.6.32.45/fs/fscache/internal.h
---- linux-2.6.32.45/fs/fscache/internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fscache/internal.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fscache/internal.h linux-2.6.32.46/fs/fscache/internal.h
+--- linux-2.6.32.46/fs/fscache/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fscache/internal.h	2011-05-04 17:56:28.000000000 -0400
 @@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void);
  extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
  extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -41794,9 +44551,9 @@ diff -urNp linux-2.6.32.45/fs/fscache/internal.h linux-2.6.32.45/fs/fscache/inte
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-2.6.32.45/fs/fscache/object.c linux-2.6.32.45/fs/fscache/object.c
---- linux-2.6.32.45/fs/fscache/object.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fscache/object.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fscache/object.c linux-2.6.32.46/fs/fscache/object.c
+--- linux-2.6.32.46/fs/fscache/object.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fscache/object.c	2011-05-04 17:56:28.000000000 -0400
 @@ -144,7 +144,7 @@ static void fscache_object_state_machine
  		/* update the object metadata on disk */
  	case FSCACHE_OBJECT_UPDATING:
@@ -41908,9 +44665,9 @@ diff -urNp linux-2.6.32.45/fs/fscache/object.c linux-2.6.32.45/fs/fscache/object
  		break;
  
  	default:
-diff -urNp linux-2.6.32.45/fs/fscache/operation.c linux-2.6.32.45/fs/fscache/operation.c
---- linux-2.6.32.45/fs/fscache/operation.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fscache/operation.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fscache/operation.c linux-2.6.32.46/fs/fscache/operation.c
+--- linux-2.6.32.46/fs/fscache/operation.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fscache/operation.c	2011-05-04 17:56:28.000000000 -0400
 @@ -16,7 +16,7 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -42026,9 +44783,9 @@ diff -urNp linux-2.6.32.45/fs/fscache/operation.c linux-2.6.32.45/fs/fscache/ope
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-2.6.32.45/fs/fscache/page.c linux-2.6.32.45/fs/fscache/page.c
---- linux-2.6.32.45/fs/fscache/page.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fscache/page.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fscache/page.c linux-2.6.32.46/fs/fscache/page.c
+--- linux-2.6.32.46/fs/fscache/page.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fscache/page.c	2011-05-04 17:56:28.000000000 -0400
 @@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct
  	val = radix_tree_lookup(&cookie->stores, page->index);
  	if (!val) {
@@ -42412,9 +45169,9 @@ diff -urNp linux-2.6.32.45/fs/fscache/page.c linux-2.6.32.45/fs/fscache/page.c
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-2.6.32.45/fs/fscache/stats.c linux-2.6.32.45/fs/fscache/stats.c
---- linux-2.6.32.45/fs/fscache/stats.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fscache/stats.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fscache/stats.c linux-2.6.32.46/fs/fscache/stats.c
+--- linux-2.6.32.46/fs/fscache/stats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fscache/stats.c	2011-05-04 17:56:28.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -42790,9 +45547,9 @@ diff -urNp linux-2.6.32.45/fs/fscache/stats.c linux-2.6.32.45/fs/fscache/stats.c
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-2.6.32.45/fs/fs_struct.c linux-2.6.32.45/fs/fs_struct.c
---- linux-2.6.32.45/fs/fs_struct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fs_struct.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fs_struct.c linux-2.6.32.46/fs/fs_struct.c
+--- linux-2.6.32.46/fs/fs_struct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fs_struct.c	2011-04-17 15:56:46.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -42872,9 +45629,9 @@ diff -urNp linux-2.6.32.45/fs/fs_struct.c linux-2.6.32.45/fs/fs_struct.c
  		write_unlock(&fs->lock);
  
  		task_unlock(current);
-diff -urNp linux-2.6.32.45/fs/fuse/cuse.c linux-2.6.32.45/fs/fuse/cuse.c
---- linux-2.6.32.45/fs/fuse/cuse.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fuse/cuse.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fuse/cuse.c linux-2.6.32.46/fs/fuse/cuse.c
+--- linux-2.6.32.46/fs/fuse/cuse.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fuse/cuse.c	2011-08-05 20:33:55.000000000 -0400
 @@ -576,10 +576,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -42892,9 +45649,9 @@ diff -urNp linux-2.6.32.45/fs/fuse/cuse.c linux-2.6.32.45/fs/fuse/cuse.c
  
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
-diff -urNp linux-2.6.32.45/fs/fuse/dev.c linux-2.6.32.45/fs/fuse/dev.c
---- linux-2.6.32.45/fs/fuse/dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fuse/dev.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fuse/dev.c linux-2.6.32.46/fs/fuse/dev.c
+--- linux-2.6.32.46/fs/fuse/dev.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/fs/fuse/dev.c	2011-08-29 22:25:07.000000000 -0400
 @@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc
  {
  	struct fuse_notify_inval_entry_out outarg;
@@ -42913,10 +45670,10 @@ diff -urNp linux-2.6.32.45/fs/fuse/dev.c linux-2.6.32.45/fs/fuse/dev.c
 +	if (!buf)
 +		goto err;
 +
- 	name.name = buf;
- 	name.len = outarg.namelen;
- 	err = fuse_copy_one(cs, buf, outarg.namelen + 1);
-@@ -910,17 +915,15 @@ static int fuse_notify_inval_entry(struc
+ 	err = -EINVAL;
+ 	if (size != sizeof(outarg) + outarg.namelen + 1)
+ 		goto err;
+@@ -914,17 +919,15 @@ static int fuse_notify_inval_entry(struc
  
  	down_read(&fc->killsb);
  	err = -ENOENT;
@@ -42938,9 +45695,9 @@ diff -urNp linux-2.6.32.45/fs/fuse/dev.c linux-2.6.32.45/fs/fuse/dev.c
  	return err;
  }
  
-diff -urNp linux-2.6.32.45/fs/fuse/dir.c linux-2.6.32.45/fs/fuse/dir.c
---- linux-2.6.32.45/fs/fuse/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/fuse/dir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/fuse/dir.c linux-2.6.32.46/fs/fuse/dir.c
+--- linux-2.6.32.46/fs/fuse/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fuse/dir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
@@ -42950,9 +45707,9 @@ diff -urNp linux-2.6.32.45/fs/fuse/dir.c linux-2.6.32.45/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-2.6.32.45/fs/gfs2/ops_inode.c linux-2.6.32.45/fs/gfs2/ops_inode.c
---- linux-2.6.32.45/fs/gfs2/ops_inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/gfs2/ops_inode.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/gfs2/ops_inode.c linux-2.6.32.46/fs/gfs2/ops_inode.c
+--- linux-2.6.32.46/fs/gfs2/ops_inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/gfs2/ops_inode.c	2011-05-16 21:46:57.000000000 -0400
 @@ -752,6 +752,8 @@ static int gfs2_rename(struct inode *odi
  	unsigned int x;
  	int error;
@@ -42962,9 +45719,9 @@ diff -urNp linux-2.6.32.45/fs/gfs2/ops_inode.c linux-2.6.32.45/fs/gfs2/ops_inode
  	if (ndentry->d_inode) {
  		nip = GFS2_I(ndentry->d_inode);
  		if (ip == nip)
-diff -urNp linux-2.6.32.45/fs/gfs2/sys.c linux-2.6.32.45/fs/gfs2/sys.c
---- linux-2.6.32.45/fs/gfs2/sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/gfs2/sys.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/gfs2/sys.c linux-2.6.32.46/fs/gfs2/sys.c
+--- linux-2.6.32.46/fs/gfs2/sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/gfs2/sys.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
  	return a->store ? a->store(sdp, buf, len) : len;
  }
@@ -42983,9 +45740,9 @@ diff -urNp linux-2.6.32.45/fs/gfs2/sys.c linux-2.6.32.45/fs/gfs2/sys.c
  	.uevent = gfs2_uevent,
  };
  
-diff -urNp linux-2.6.32.45/fs/hfsplus/catalog.c linux-2.6.32.45/fs/hfsplus/catalog.c
---- linux-2.6.32.45/fs/hfsplus/catalog.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/hfsplus/catalog.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/hfsplus/catalog.c linux-2.6.32.46/fs/hfsplus/catalog.c
+--- linux-2.6.32.46/fs/hfsplus/catalog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/hfsplus/catalog.c	2011-05-16 21:46:57.000000000 -0400
 @@ -157,6 +157,8 @@ int hfsplus_find_cat(struct super_block 
  	int err;
  	u16 type;
@@ -43013,9 +45770,9 @@ diff -urNp linux-2.6.32.45/fs/hfsplus/catalog.c linux-2.6.32.45/fs/hfsplus/catal
  	dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name,
  		dst_dir->i_ino, dst_name->name);
  	sb = src_dir->i_sb;
-diff -urNp linux-2.6.32.45/fs/hfsplus/dir.c linux-2.6.32.45/fs/hfsplus/dir.c
---- linux-2.6.32.45/fs/hfsplus/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/hfsplus/dir.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/hfsplus/dir.c linux-2.6.32.46/fs/hfsplus/dir.c
+--- linux-2.6.32.46/fs/hfsplus/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/hfsplus/dir.c	2011-05-16 21:46:57.000000000 -0400
 @@ -121,6 +121,8 @@ static int hfsplus_readdir(struct file *
  	struct hfsplus_readdir_data *rd;
  	u16 type;
@@ -43025,9 +45782,9 @@ diff -urNp linux-2.6.32.45/fs/hfsplus/dir.c linux-2.6.32.45/fs/hfsplus/dir.c
  	if (filp->f_pos >= inode->i_size)
  		return 0;
  
-diff -urNp linux-2.6.32.45/fs/hfsplus/inode.c linux-2.6.32.45/fs/hfsplus/inode.c
---- linux-2.6.32.45/fs/hfsplus/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/hfsplus/inode.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/hfsplus/inode.c linux-2.6.32.46/fs/hfsplus/inode.c
+--- linux-2.6.32.46/fs/hfsplus/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/hfsplus/inode.c	2011-05-16 21:46:57.000000000 -0400
 @@ -399,6 +399,8 @@ int hfsplus_cat_read_inode(struct inode 
  	int res = 0;
  	u16 type;
@@ -43046,9 +45803,9 @@ diff -urNp linux-2.6.32.45/fs/hfsplus/inode.c linux-2.6.32.45/fs/hfsplus/inode.c
  	if (HFSPLUS_IS_RSRC(inode))
  		main_inode = HFSPLUS_I(inode).rsrc_inode;
  
-diff -urNp linux-2.6.32.45/fs/hfsplus/ioctl.c linux-2.6.32.45/fs/hfsplus/ioctl.c
---- linux-2.6.32.45/fs/hfsplus/ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/hfsplus/ioctl.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/hfsplus/ioctl.c linux-2.6.32.46/fs/hfsplus/ioctl.c
+--- linux-2.6.32.46/fs/hfsplus/ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/hfsplus/ioctl.c	2011-05-16 21:46:57.000000000 -0400
 @@ -101,6 +101,8 @@ int hfsplus_setxattr(struct dentry *dent
  	struct hfsplus_cat_file *file;
  	int res;
@@ -43067,9 +45824,9 @@ diff -urNp linux-2.6.32.45/fs/hfsplus/ioctl.c linux-2.6.32.45/fs/hfsplus/ioctl.c
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-diff -urNp linux-2.6.32.45/fs/hfsplus/super.c linux-2.6.32.45/fs/hfsplus/super.c
---- linux-2.6.32.45/fs/hfsplus/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/hfsplus/super.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/hfsplus/super.c linux-2.6.32.46/fs/hfsplus/super.c
+--- linux-2.6.32.46/fs/hfsplus/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/hfsplus/super.c	2011-05-16 21:46:57.000000000 -0400
 @@ -312,6 +312,8 @@ static int hfsplus_fill_super(struct sup
  	struct nls_table *nls = NULL;
  	int err = -EINVAL;
@@ -43079,9 +45836,9 @@ diff -urNp linux-2.6.32.45/fs/hfsplus/super.c linux-2.6.32.45/fs/hfsplus/super.c
  	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
  	if (!sbi)
  		return -ENOMEM;
-diff -urNp linux-2.6.32.45/fs/hugetlbfs/inode.c linux-2.6.32.45/fs/hugetlbfs/inode.c
---- linux-2.6.32.45/fs/hugetlbfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/hugetlbfs/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/hugetlbfs/inode.c linux-2.6.32.46/fs/hugetlbfs/inode.c
+--- linux-2.6.32.46/fs/hugetlbfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/hugetlbfs/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
@@ -43091,9 +45848,9 @@ diff -urNp linux-2.6.32.45/fs/hugetlbfs/inode.c linux-2.6.32.45/fs/hugetlbfs/ino
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-2.6.32.45/fs/ioctl.c linux-2.6.32.45/fs/ioctl.c
---- linux-2.6.32.45/fs/ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ioctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ioctl.c linux-2.6.32.46/fs/ioctl.c
+--- linux-2.6.32.46/fs/ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ioctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
  			    u64 phys, u64 len, u32 flags)
  {
@@ -43121,9 +45878,9 @@ diff -urNp linux-2.6.32.45/fs/ioctl.c linux-2.6.32.45/fs/ioctl.c
  		error = -EFAULT;
  
  	return error;
-diff -urNp linux-2.6.32.45/fs/jbd/checkpoint.c linux-2.6.32.45/fs/jbd/checkpoint.c
---- linux-2.6.32.45/fs/jbd/checkpoint.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jbd/checkpoint.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jbd/checkpoint.c linux-2.6.32.46/fs/jbd/checkpoint.c
+--- linux-2.6.32.46/fs/jbd/checkpoint.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jbd/checkpoint.c	2011-05-16 21:46:57.000000000 -0400
 @@ -348,6 +348,8 @@ int log_do_checkpoint(journal_t *journal
  	tid_t this_tid;
  	int result;
@@ -43133,9 +45890,9 @@ diff -urNp linux-2.6.32.45/fs/jbd/checkpoint.c linux-2.6.32.45/fs/jbd/checkpoint
  	jbd_debug(1, "Start checkpoint\n");
  
  	/*
-diff -urNp linux-2.6.32.45/fs/jffs2/compr_rtime.c linux-2.6.32.45/fs/jffs2/compr_rtime.c
---- linux-2.6.32.45/fs/jffs2/compr_rtime.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jffs2/compr_rtime.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jffs2/compr_rtime.c linux-2.6.32.46/fs/jffs2/compr_rtime.c
+--- linux-2.6.32.46/fs/jffs2/compr_rtime.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jffs2/compr_rtime.c	2011-05-16 21:46:57.000000000 -0400
 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
  	int outpos = 0;
  	int pos=0;
@@ -43154,9 +45911,9 @@ diff -urNp linux-2.6.32.45/fs/jffs2/compr_rtime.c linux-2.6.32.45/fs/jffs2/compr
  	memset(positions,0,sizeof(positions));
  
  	while (outpos<destlen) {
-diff -urNp linux-2.6.32.45/fs/jffs2/compr_rubin.c linux-2.6.32.45/fs/jffs2/compr_rubin.c
---- linux-2.6.32.45/fs/jffs2/compr_rubin.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jffs2/compr_rubin.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jffs2/compr_rubin.c linux-2.6.32.46/fs/jffs2/compr_rubin.c
+--- linux-2.6.32.46/fs/jffs2/compr_rubin.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jffs2/compr_rubin.c	2011-05-16 21:46:57.000000000 -0400
 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
  	int ret;
  	uint32_t mysrclen, mydstlen;
@@ -43166,9 +45923,9 @@ diff -urNp linux-2.6.32.45/fs/jffs2/compr_rubin.c linux-2.6.32.45/fs/jffs2/compr
  	mysrclen = *sourcelen;
  	mydstlen = *dstlen - 8;
  
-diff -urNp linux-2.6.32.45/fs/jffs2/erase.c linux-2.6.32.45/fs/jffs2/erase.c
---- linux-2.6.32.45/fs/jffs2/erase.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jffs2/erase.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jffs2/erase.c linux-2.6.32.46/fs/jffs2/erase.c
+--- linux-2.6.32.46/fs/jffs2/erase.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jffs2/erase.c	2011-04-17 15:56:46.000000000 -0400
 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -43179,9 +45936,9 @@ diff -urNp linux-2.6.32.45/fs/jffs2/erase.c linux-2.6.32.45/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.32.45/fs/jffs2/wbuf.c linux-2.6.32.45/fs/jffs2/wbuf.c
---- linux-2.6.32.45/fs/jffs2/wbuf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jffs2/wbuf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jffs2/wbuf.c linux-2.6.32.46/fs/jffs2/wbuf.c
+--- linux-2.6.32.46/fs/jffs2/wbuf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jffs2/wbuf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -43192,9 +45949,9 @@ diff -urNp linux-2.6.32.45/fs/jffs2/wbuf.c linux-2.6.32.45/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-2.6.32.45/fs/jffs2/xattr.c linux-2.6.32.45/fs/jffs2/xattr.c
---- linux-2.6.32.45/fs/jffs2/xattr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jffs2/xattr.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jffs2/xattr.c linux-2.6.32.46/fs/jffs2/xattr.c
+--- linux-2.6.32.46/fs/jffs2/xattr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jffs2/xattr.c	2011-05-16 21:46:57.000000000 -0400
 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
  	BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -43204,9 +45961,9 @@ diff -urNp linux-2.6.32.45/fs/jffs2/xattr.c linux-2.6.32.45/fs/jffs2/xattr.c
  	/* Phase.1 : Merge same xref */
  	for (i=0; i < XREF_TMPHASH_SIZE; i++)
  		xref_tmphash[i] = NULL;
-diff -urNp linux-2.6.32.45/fs/jfs/super.c linux-2.6.32.45/fs/jfs/super.c
---- linux-2.6.32.45/fs/jfs/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/jfs/super.c	2011-06-07 18:06:04.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/jfs/super.c linux-2.6.32.46/fs/jfs/super.c
+--- linux-2.6.32.46/fs/jfs/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/jfs/super.c	2011-06-07 18:06:04.000000000 -0400
 @@ -793,7 +793,7 @@ static int __init init_jfs_fs(void)
  
  	jfs_inode_cachep =
@@ -43216,9 +45973,9 @@ diff -urNp linux-2.6.32.45/fs/jfs/super.c linux-2.6.32.45/fs/jfs/super.c
  			    init_once);
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
-diff -urNp linux-2.6.32.45/fs/Kconfig.binfmt linux-2.6.32.45/fs/Kconfig.binfmt
---- linux-2.6.32.45/fs/Kconfig.binfmt	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/Kconfig.binfmt	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/Kconfig.binfmt linux-2.6.32.46/fs/Kconfig.binfmt
+--- linux-2.6.32.46/fs/Kconfig.binfmt	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/Kconfig.binfmt	2011-04-17 15:56:46.000000000 -0400
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -43228,9 +45985,9 @@ diff -urNp linux-2.6.32.45/fs/Kconfig.binfmt linux-2.6.32.45/fs/Kconfig.binfmt
  	---help---
  	  A.out (Assembler.OUTput) is a set of formats for libraries and
  	  executables used in the earliest versions of UNIX.  Linux used
-diff -urNp linux-2.6.32.45/fs/libfs.c linux-2.6.32.45/fs/libfs.c
---- linux-2.6.32.45/fs/libfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/libfs.c	2011-05-11 18:25:15.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/libfs.c linux-2.6.32.46/fs/libfs.c
+--- linux-2.6.32.46/fs/libfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/libfs.c	2011-05-11 18:25:15.000000000 -0400
 @@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, v
  
  			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
@@ -43253,9 +46010,9 @@ diff -urNp linux-2.6.32.45/fs/libfs.c linux-2.6.32.45/fs/libfs.c
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff -urNp linux-2.6.32.45/fs/lockd/clntproc.c linux-2.6.32.45/fs/lockd/clntproc.c
---- linux-2.6.32.45/fs/lockd/clntproc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/lockd/clntproc.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/lockd/clntproc.c linux-2.6.32.46/fs/lockd/clntproc.c
+--- linux-2.6.32.46/fs/lockd/clntproc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/lockd/clntproc.c	2011-05-16 21:46:57.000000000 -0400
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -43279,9 +46036,9 @@ diff -urNp linux-2.6.32.45/fs/lockd/clntproc.c linux-2.6.32.45/fs/lockd/clntproc
  	req = &reqst;
  	memset(req, 0, sizeof(*req));
  	locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-2.6.32.45/fs/lockd/svc.c linux-2.6.32.45/fs/lockd/svc.c
---- linux-2.6.32.45/fs/lockd/svc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/lockd/svc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/lockd/svc.c linux-2.6.32.46/fs/lockd/svc.c
+--- linux-2.6.32.46/fs/lockd/svc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/lockd/svc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,7 +43,7 @@
  
  static struct svc_program	nlmsvc_program;
@@ -43291,9 +46048,9 @@ diff -urNp linux-2.6.32.45/fs/lockd/svc.c linux-2.6.32.45/fs/lockd/svc.c
  EXPORT_SYMBOL_GPL(nlmsvc_ops);
  
  static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.32.45/fs/locks.c linux-2.6.32.45/fs/locks.c
---- linux-2.6.32.45/fs/locks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/locks.c	2011-07-06 19:47:11.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/locks.c linux-2.6.32.46/fs/locks.c
+--- linux-2.6.32.46/fs/locks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/locks.c	2011-07-06 19:47:11.000000000 -0400
 @@ -145,10 +145,28 @@ static LIST_HEAD(blocked_list);
  
  static struct kmem_cache *filelock_cache __read_mostly;
@@ -43364,9 +46121,9 @@ diff -urNp linux-2.6.32.45/fs/locks.c linux-2.6.32.45/fs/locks.c
  	}
  
  	lock_kernel();
-diff -urNp linux-2.6.32.45/fs/mbcache.c linux-2.6.32.45/fs/mbcache.c
---- linux-2.6.32.45/fs/mbcache.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/mbcache.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/mbcache.c linux-2.6.32.46/fs/mbcache.c
+--- linux-2.6.32.46/fs/mbcache.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/mbcache.c	2011-08-05 20:33:55.000000000 -0400
 @@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct
  	if (!cache)
  		goto fail;
@@ -43379,9 +46136,9 @@ diff -urNp linux-2.6.32.45/fs/mbcache.c linux-2.6.32.45/fs/mbcache.c
  	atomic_set(&cache->c_entry_count, 0);
  	cache->c_bucket_bits = bucket_bits;
  #ifdef MB_CACHE_INDEXES_COUNT
-diff -urNp linux-2.6.32.45/fs/namei.c linux-2.6.32.45/fs/namei.c
---- linux-2.6.32.45/fs/namei.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/namei.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
+--- linux-2.6.32.46/fs/namei.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/namei.c	2011-05-16 21:46:57.000000000 -0400
 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -43817,9 +46574,9 @@ diff -urNp linux-2.6.32.45/fs/namei.c linux-2.6.32.45/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-2.6.32.45/fs/namespace.c linux-2.6.32.45/fs/namespace.c
---- linux-2.6.32.45/fs/namespace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/namespace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/namespace.c linux-2.6.32.46/fs/namespace.c
+--- linux-2.6.32.46/fs/namespace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/namespace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -43880,9 +46637,9 @@ diff -urNp linux-2.6.32.45/fs/namespace.c linux-2.6.32.45/fs/namespace.c
  	read_lock(&current->fs->lock);
  	root = current->fs->root;
  	path_get(&current->fs->root);
-diff -urNp linux-2.6.32.45/fs/ncpfs/dir.c linux-2.6.32.45/fs/ncpfs/dir.c
---- linux-2.6.32.45/fs/ncpfs/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ncpfs/dir.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ncpfs/dir.c linux-2.6.32.46/fs/ncpfs/dir.c
+--- linux-2.6.32.46/fs/ncpfs/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ncpfs/dir.c	2011-05-16 21:46:57.000000000 -0400
 @@ -275,6 +275,8 @@ __ncp_lookup_validate(struct dentry *den
  	int res, val = 0, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
@@ -43942,9 +46699,9 @@ diff -urNp linux-2.6.32.45/fs/ncpfs/dir.c linux-2.6.32.45/fs/ncpfs/dir.c
  	DPRINTK("ncp_rename: %s/%s to %s/%s\n",
  		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
  		new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
-diff -urNp linux-2.6.32.45/fs/ncpfs/inode.c linux-2.6.32.45/fs/ncpfs/inode.c
---- linux-2.6.32.45/fs/ncpfs/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ncpfs/inode.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ncpfs/inode.c linux-2.6.32.46/fs/ncpfs/inode.c
+--- linux-2.6.32.46/fs/ncpfs/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ncpfs/inode.c	2011-05-16 21:46:57.000000000 -0400
 @@ -445,6 +445,8 @@ static int ncp_fill_super(struct super_b
  #endif
  	struct ncp_entry_info finfo;
@@ -43954,9 +46711,9 @@ diff -urNp linux-2.6.32.45/fs/ncpfs/inode.c linux-2.6.32.45/fs/ncpfs/inode.c
  	data.wdog_pid = NULL;
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
-diff -urNp linux-2.6.32.45/fs/nfs/inode.c linux-2.6.32.45/fs/nfs/inode.c
---- linux-2.6.32.45/fs/nfs/inode.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/fs/nfs/inode.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/nfs/inode.c linux-2.6.32.46/fs/nfs/inode.c
+--- linux-2.6.32.46/fs/nfs/inode.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/fs/nfs/inode.c	2011-07-06 19:53:33.000000000 -0400
 @@ -156,7 +156,7 @@ static void nfs_zap_caches_locked(struct
  	nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
  	nfsi->attrtimeo_timestamp = jiffies;
@@ -43986,9 +46743,9 @@ diff -urNp linux-2.6.32.45/fs/nfs/inode.c linux-2.6.32.45/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.32.45/fs/nfsd/lockd.c linux-2.6.32.45/fs/nfsd/lockd.c
---- linux-2.6.32.45/fs/nfsd/lockd.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/fs/nfsd/lockd.c	2011-04-17 17:03:15.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/nfsd/lockd.c linux-2.6.32.46/fs/nfsd/lockd.c
+--- linux-2.6.32.46/fs/nfsd/lockd.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/fs/nfsd/lockd.c	2011-04-17 17:03:15.000000000 -0400
 @@ -66,7 +66,7 @@ nlm_fclose(struct file *filp)
  	fput(filp);
  }
@@ -43998,9 +46755,9 @@ diff -urNp linux-2.6.32.45/fs/nfsd/lockd.c linux-2.6.32.45/fs/nfsd/lockd.c
  	.fopen		= nlm_fopen,		/* open file for locking */
  	.fclose		= nlm_fclose,		/* close file */
  };
-diff -urNp linux-2.6.32.45/fs/nfsd/nfs4state.c linux-2.6.32.45/fs/nfsd/nfs4state.c
---- linux-2.6.32.45/fs/nfsd/nfs4state.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/nfsd/nfs4state.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/nfsd/nfs4state.c linux-2.6.32.46/fs/nfsd/nfs4state.c
+--- linux-2.6.32.46/fs/nfsd/nfs4state.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/nfsd/nfs4state.c	2011-05-16 21:46:57.000000000 -0400
 @@ -3457,6 +3457,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
  	unsigned int cmd;
  	int err;
@@ -44010,9 +46767,9 @@ diff -urNp linux-2.6.32.45/fs/nfsd/nfs4state.c linux-2.6.32.45/fs/nfsd/nfs4state
  	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
  		(long long) lock->lk_offset,
  		(long long) lock->lk_length);
-diff -urNp linux-2.6.32.45/fs/nfsd/nfs4xdr.c linux-2.6.32.45/fs/nfsd/nfs4xdr.c
---- linux-2.6.32.45/fs/nfsd/nfs4xdr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/nfsd/nfs4xdr.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/nfsd/nfs4xdr.c linux-2.6.32.46/fs/nfsd/nfs4xdr.c
+--- linux-2.6.32.46/fs/nfsd/nfs4xdr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/nfsd/nfs4xdr.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1751,6 +1751,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
  	struct nfsd4_compoundres *resp = rqstp->rq_resp;
  	u32 minorversion = resp->cstate.minorversion;
@@ -44022,9 +46779,9 @@ diff -urNp linux-2.6.32.45/fs/nfsd/nfs4xdr.c linux-2.6.32.45/fs/nfsd/nfs4xdr.c
  	BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
  	BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
  	BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff -urNp linux-2.6.32.45/fs/nfsd/vfs.c linux-2.6.32.45/fs/nfsd/vfs.c
---- linux-2.6.32.45/fs/nfsd/vfs.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/fs/nfsd/vfs.c	2011-05-10 22:12:33.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/nfsd/vfs.c linux-2.6.32.46/fs/nfsd/vfs.c
+--- linux-2.6.32.46/fs/nfsd/vfs.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/fs/nfsd/vfs.c	2011-05-10 22:12:33.000000000 -0400
 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -44052,9 +46809,9 @@ diff -urNp linux-2.6.32.45/fs/nfsd/vfs.c linux-2.6.32.45/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-2.6.32.45/fs/nilfs2/ioctl.c linux-2.6.32.45/fs/nilfs2/ioctl.c
---- linux-2.6.32.45/fs/nilfs2/ioctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/nilfs2/ioctl.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/nilfs2/ioctl.c linux-2.6.32.46/fs/nilfs2/ioctl.c
+--- linux-2.6.32.46/fs/nilfs2/ioctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/nilfs2/ioctl.c	2011-05-04 17:56:28.000000000 -0400
 @@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(st
  				      unsigned int cmd, void __user *argp)
  {
@@ -44064,9 +46821,9 @@ diff -urNp linux-2.6.32.45/fs/nilfs2/ioctl.c linux-2.6.32.45/fs/nilfs2/ioctl.c
  		sizeof(struct nilfs_vdesc),
  		sizeof(struct nilfs_period),
  		sizeof(__u64),
-diff -urNp linux-2.6.32.45/fs/notify/dnotify/dnotify.c linux-2.6.32.45/fs/notify/dnotify/dnotify.c
---- linux-2.6.32.45/fs/notify/dnotify/dnotify.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/notify/dnotify/dnotify.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/notify/dnotify/dnotify.c linux-2.6.32.46/fs/notify/dnotify/dnotify.c
+--- linux-2.6.32.46/fs/notify/dnotify/dnotify.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/notify/dnotify/dnotify.c	2011-04-17 15:56:46.000000000 -0400
 @@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsn
  	kmem_cache_free(dnotify_mark_entry_cache, dnentry);
  }
@@ -44076,9 +46833,9 @@ diff -urNp linux-2.6.32.45/fs/notify/dnotify/dnotify.c linux-2.6.32.45/fs/notify
  	.handle_event = dnotify_handle_event,
  	.should_send_event = dnotify_should_send_event,
  	.free_group_priv = NULL,
-diff -urNp linux-2.6.32.45/fs/notify/notification.c linux-2.6.32.45/fs/notify/notification.c
---- linux-2.6.32.45/fs/notify/notification.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/notify/notification.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/notify/notification.c linux-2.6.32.46/fs/notify/notification.c
+--- linux-2.6.32.46/fs/notify/notification.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/notify/notification.c	2011-05-04 17:56:28.000000000 -0400
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -44097,9 +46854,9 @@ diff -urNp linux-2.6.32.45/fs/notify/notification.c linux-2.6.32.45/fs/notify/no
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-2.6.32.45/fs/ntfs/dir.c linux-2.6.32.45/fs/ntfs/dir.c
---- linux-2.6.32.45/fs/ntfs/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ntfs/dir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ntfs/dir.c linux-2.6.32.46/fs/ntfs/dir.c
+--- linux-2.6.32.46/fs/ntfs/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ntfs/dir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1328,7 +1328,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -44109,9 +46866,9 @@ diff -urNp linux-2.6.32.45/fs/ntfs/dir.c linux-2.6.32.45/fs/ntfs/dir.c
  		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
  				"inode 0x%lx or driver bug.", vdir->i_ino);
  		goto err_out;
-diff -urNp linux-2.6.32.45/fs/ntfs/file.c linux-2.6.32.45/fs/ntfs/file.c
---- linux-2.6.32.45/fs/ntfs/file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ntfs/file.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ntfs/file.c linux-2.6.32.46/fs/ntfs/file.c
+--- linux-2.6.32.46/fs/ntfs/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ntfs/file.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -44121,9 +46878,9 @@ diff -urNp linux-2.6.32.45/fs/ntfs/file.c linux-2.6.32.45/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.32.45/fs/ocfs2/cluster/masklog.c linux-2.6.32.45/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.45/fs/ocfs2/cluster/masklog.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ocfs2/cluster/masklog.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ocfs2/cluster/masklog.c linux-2.6.32.46/fs/ocfs2/cluster/masklog.c
+--- linux-2.6.32.46/fs/ocfs2/cluster/masklog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ocfs2/cluster/masklog.c	2011-04-17 15:56:46.000000000 -0400
 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
  	return mlog_mask_store(mlog_attr->mask, buf, count);
  }
@@ -44133,9 +46890,9 @@ diff -urNp linux-2.6.32.45/fs/ocfs2/cluster/masklog.c linux-2.6.32.45/fs/ocfs2/c
  	.show  = mlog_show,
  	.store = mlog_store,
  };
-diff -urNp linux-2.6.32.45/fs/ocfs2/localalloc.c linux-2.6.32.45/fs/ocfs2/localalloc.c
---- linux-2.6.32.45/fs/ocfs2/localalloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ocfs2/localalloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ocfs2/localalloc.c linux-2.6.32.46/fs/ocfs2/localalloc.c
+--- linux-2.6.32.46/fs/ocfs2/localalloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ocfs2/localalloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
@@ -44145,9 +46902,9 @@ diff -urNp linux-2.6.32.45/fs/ocfs2/localalloc.c linux-2.6.32.45/fs/ocfs2/locala
  
  	status = 0;
  bail:
-diff -urNp linux-2.6.32.45/fs/ocfs2/namei.c linux-2.6.32.45/fs/ocfs2/namei.c
---- linux-2.6.32.45/fs/ocfs2/namei.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ocfs2/namei.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ocfs2/namei.c linux-2.6.32.46/fs/ocfs2/namei.c
+--- linux-2.6.32.46/fs/ocfs2/namei.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ocfs2/namei.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1043,6 +1043,8 @@ static int ocfs2_rename(struct inode *ol
  	struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
  	struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -44157,9 +46914,9 @@ diff -urNp linux-2.6.32.45/fs/ocfs2/namei.c linux-2.6.32.45/fs/ocfs2/namei.c
  	/* At some point it might be nice to break this function up a
  	 * bit. */
  
-diff -urNp linux-2.6.32.45/fs/ocfs2/ocfs2.h linux-2.6.32.45/fs/ocfs2/ocfs2.h
---- linux-2.6.32.45/fs/ocfs2/ocfs2.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ocfs2/ocfs2.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ocfs2/ocfs2.h linux-2.6.32.46/fs/ocfs2/ocfs2.h
+--- linux-2.6.32.46/fs/ocfs2/ocfs2.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ocfs2/ocfs2.h	2011-04-17 15:56:46.000000000 -0400
 @@ -217,11 +217,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -44177,9 +46934,9 @@ diff -urNp linux-2.6.32.45/fs/ocfs2/ocfs2.h linux-2.6.32.45/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.32.45/fs/ocfs2/suballoc.c linux-2.6.32.45/fs/ocfs2/suballoc.c
---- linux-2.6.32.45/fs/ocfs2/suballoc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ocfs2/suballoc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ocfs2/suballoc.c linux-2.6.32.46/fs/ocfs2/suballoc.c
+--- linux-2.6.32.46/fs/ocfs2/suballoc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ocfs2/suballoc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
@@ -44225,9 +46982,9 @@ diff -urNp linux-2.6.32.45/fs/ocfs2/suballoc.c linux-2.6.32.45/fs/ocfs2/suballoc
  		}
  	}
  	if (status < 0) {
-diff -urNp linux-2.6.32.45/fs/ocfs2/super.c linux-2.6.32.45/fs/ocfs2/super.c
---- linux-2.6.32.45/fs/ocfs2/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/ocfs2/super.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/ocfs2/super.c linux-2.6.32.46/fs/ocfs2/super.c
+--- linux-2.6.32.46/fs/ocfs2/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ocfs2/super.c	2011-04-17 15:56:46.000000000 -0400
 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -44262,9 +47019,9 @@ diff -urNp linux-2.6.32.45/fs/ocfs2/super.c linux-2.6.32.45/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.32.45/fs/open.c linux-2.6.32.45/fs/open.c
---- linux-2.6.32.45/fs/open.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/open.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/open.c linux-2.6.32.46/fs/open.c
+--- linux-2.6.32.46/fs/open.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/open.c	2011-04-17 15:56:46.000000000 -0400
 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -44449,9 +47206,9 @@ diff -urNp linux-2.6.32.45/fs/open.c linux-2.6.32.45/fs/open.c
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-2.6.32.45/fs/partitions/ldm.c linux-2.6.32.45/fs/partitions/ldm.c
---- linux-2.6.32.45/fs/partitions/ldm.c	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.45/fs/partitions/ldm.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/partitions/ldm.c linux-2.6.32.46/fs/partitions/ldm.c
+--- linux-2.6.32.46/fs/partitions/ldm.c	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/fs/partitions/ldm.c	2011-06-25 12:56:37.000000000 -0400
 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
  		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
@@ -44469,9 +47226,9 @@ diff -urNp linux-2.6.32.45/fs/partitions/ldm.c linux-2.6.32.45/fs/partitions/ldm
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-diff -urNp linux-2.6.32.45/fs/partitions/mac.c linux-2.6.32.45/fs/partitions/mac.c
---- linux-2.6.32.45/fs/partitions/mac.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/partitions/mac.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/partitions/mac.c linux-2.6.32.46/fs/partitions/mac.c
+--- linux-2.6.32.46/fs/partitions/mac.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/partitions/mac.c	2011-04-17 15:56:46.000000000 -0400
 @@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitio
  		return 0;		/* not a MacOS disk */
  	}
@@ -44485,9 +47242,9 @@ diff -urNp linux-2.6.32.45/fs/partitions/mac.c linux-2.6.32.45/fs/partitions/mac
  	for (slot = 1; slot <= blocks_in_map; ++slot) {
  		int pos = slot * secsize;
  		put_dev_sector(sect);
-diff -urNp linux-2.6.32.45/fs/pipe.c linux-2.6.32.45/fs/pipe.c
---- linux-2.6.32.45/fs/pipe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/pipe.c	2011-04-23 13:37:17.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/pipe.c linux-2.6.32.46/fs/pipe.c
+--- linux-2.6.32.46/fs/pipe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/pipe.c	2011-04-23 13:37:17.000000000 -0400
 @@ -401,9 +401,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -44611,9 +47368,9 @@ diff -urNp linux-2.6.32.45/fs/pipe.c linux-2.6.32.45/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-2.6.32.45/fs/proc/array.c linux-2.6.32.45/fs/proc/array.c
---- linux-2.6.32.45/fs/proc/array.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/array.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/array.c linux-2.6.32.46/fs/proc/array.c
+--- linux-2.6.32.46/fs/proc/array.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/array.c	2011-05-16 21:46:57.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -44737,9 +47494,9 @@ diff -urNp linux-2.6.32.45/fs/proc/array.c linux-2.6.32.45/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-2.6.32.45/fs/proc/base.c linux-2.6.32.45/fs/proc/base.c
---- linux-2.6.32.45/fs/proc/base.c	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/base.c	2011-08-09 18:34:33.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
+--- linux-2.6.32.46/fs/proc/base.c	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/fs/proc/base.c	2011-08-09 18:34:33.000000000 -0400
 @@ -102,6 +102,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -45172,9 +47929,9 @@ diff -urNp linux-2.6.32.45/fs/proc/base.c linux-2.6.32.45/fs/proc/base.c
  	ONE("stack",      S_IRUSR, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.32.45/fs/proc/cmdline.c linux-2.6.32.45/fs/proc/cmdline.c
---- linux-2.6.32.45/fs/proc/cmdline.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/cmdline.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/cmdline.c linux-2.6.32.46/fs/proc/cmdline.c
+--- linux-2.6.32.46/fs/proc/cmdline.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/cmdline.c	2011-04-17 15:56:46.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -45187,9 +47944,9 @@ diff -urNp linux-2.6.32.45/fs/proc/cmdline.c linux-2.6.32.45/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-2.6.32.45/fs/proc/devices.c linux-2.6.32.45/fs/proc/devices.c
---- linux-2.6.32.45/fs/proc/devices.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/devices.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/devices.c linux-2.6.32.46/fs/proc/devices.c
+--- linux-2.6.32.46/fs/proc/devices.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/devices.c	2011-04-17 15:56:46.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -45202,9 +47959,9 @@ diff -urNp linux-2.6.32.45/fs/proc/devices.c linux-2.6.32.45/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-2.6.32.45/fs/proc/inode.c linux-2.6.32.45/fs/proc/inode.c
---- linux-2.6.32.45/fs/proc/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/inode.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/inode.c linux-2.6.32.46/fs/proc/inode.c
+--- linux-2.6.32.46/fs/proc/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/inode.c	2011-04-17 15:56:46.000000000 -0400
 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
@@ -45217,9 +47974,9 @@ diff -urNp linux-2.6.32.45/fs/proc/inode.c linux-2.6.32.45/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-2.6.32.45/fs/proc/internal.h linux-2.6.32.45/fs/proc/internal.h
---- linux-2.6.32.45/fs/proc/internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/internal.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/internal.h linux-2.6.32.46/fs/proc/internal.h
+--- linux-2.6.32.46/fs/proc/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/internal.h	2011-04-17 15:56:46.000000000 -0400
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -45230,9 +47987,9 @@ diff -urNp linux-2.6.32.45/fs/proc/internal.h linux-2.6.32.45/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.32.45/fs/proc/Kconfig linux-2.6.32.45/fs/proc/Kconfig
---- linux-2.6.32.45/fs/proc/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/Kconfig linux-2.6.32.46/fs/proc/Kconfig
+--- linux-2.6.32.46/fs/proc/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -45260,9 +48017,9 @@ diff -urNp linux-2.6.32.45/fs/proc/Kconfig linux-2.6.32.45/fs/proc/Kconfig
  	bool "Enable /proc page monitoring" if EMBEDDED
   	help
  	  Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.32.45/fs/proc/kcore.c linux-2.6.32.45/fs/proc/kcore.c
---- linux-2.6.32.45/fs/proc/kcore.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/kcore.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/kcore.c linux-2.6.32.46/fs/proc/kcore.c
+--- linux-2.6.32.46/fs/proc/kcore.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/kcore.c	2011-05-16 21:46:57.000000000 -0400
 @@ -320,6 +320,8 @@ static void elf_kcore_store_hdr(char *bu
  	off_t offset = 0;
  	struct kcore_list *m;
@@ -45330,9 +48087,9 @@ diff -urNp linux-2.6.32.45/fs/proc/kcore.c linux-2.6.32.45/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-2.6.32.45/fs/proc/meminfo.c linux-2.6.32.45/fs/proc/meminfo.c
---- linux-2.6.32.45/fs/proc/meminfo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/meminfo.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/meminfo.c linux-2.6.32.46/fs/proc/meminfo.c
+--- linux-2.6.32.46/fs/proc/meminfo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/meminfo.c	2011-05-16 21:46:57.000000000 -0400
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
  	unsigned long pages[NR_LRU_LISTS];
  	int lru;
@@ -45351,9 +48108,9 @@ diff -urNp linux-2.6.32.45/fs/proc/meminfo.c linux-2.6.32.45/fs/proc/meminfo.c
  #endif
  		);
  
-diff -urNp linux-2.6.32.45/fs/proc/nommu.c linux-2.6.32.45/fs/proc/nommu.c
---- linux-2.6.32.45/fs/proc/nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/nommu.c linux-2.6.32.46/fs/proc/nommu.c
+--- linux-2.6.32.46/fs/proc/nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
@@ -45363,9 +48120,9 @@ diff -urNp linux-2.6.32.45/fs/proc/nommu.c linux-2.6.32.45/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.32.45/fs/proc/proc_net.c linux-2.6.32.45/fs/proc/proc_net.c
---- linux-2.6.32.45/fs/proc/proc_net.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/proc_net.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/proc_net.c linux-2.6.32.46/fs/proc/proc_net.c
+--- linux-2.6.32.46/fs/proc/proc_net.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/proc_net.c	2011-04-17 15:56:46.000000000 -0400
 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
@@ -45384,9 +48141,9 @@ diff -urNp linux-2.6.32.45/fs/proc/proc_net.c linux-2.6.32.45/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.32.45/fs/proc/proc_sysctl.c linux-2.6.32.45/fs/proc/proc_sysctl.c
---- linux-2.6.32.45/fs/proc/proc_sysctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/proc_sysctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sysctl.c
+--- linux-2.6.32.46/fs/proc/proc_sysctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/proc_sysctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -7,6 +7,8 @@
  #include <linux/security.h>
  #include "internal.h"
@@ -45426,9 +48183,9 @@ diff -urNp linux-2.6.32.45/fs/proc/proc_sysctl.c linux-2.6.32.45/fs/proc/proc_sy
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.32.45/fs/proc/root.c linux-2.6.32.45/fs/proc/root.c
---- linux-2.6.32.45/fs/proc/root.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/root.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/root.c linux-2.6.32.46/fs/proc/root.c
+--- linux-2.6.32.46/fs/proc/root.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/root.c	2011-04-17 15:56:46.000000000 -0400
 @@ -134,7 +134,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
@@ -45445,9 +48202,9 @@ diff -urNp linux-2.6.32.45/fs/proc/root.c linux-2.6.32.45/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-2.6.32.45/fs/proc/task_mmu.c linux-2.6.32.45/fs/proc/task_mmu.c
---- linux-2.6.32.45/fs/proc/task_mmu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/task_mmu.c	2011-04-23 13:38:09.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/task_mmu.c linux-2.6.32.46/fs/proc/task_mmu.c
+--- linux-2.6.32.46/fs/proc/task_mmu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/task_mmu.c	2011-04-23 13:38:09.000000000 -0400
 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
  		"VmStk:\t%8lu kB\n"
  		"VmExe:\t%8lu kB\n"
@@ -45593,9 +48350,9 @@ diff -urNp linux-2.6.32.45/fs/proc/task_mmu.c linux-2.6.32.45/fs/proc/task_mmu.c
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-diff -urNp linux-2.6.32.45/fs/proc/task_nommu.c linux-2.6.32.45/fs/proc/task_nommu.c
---- linux-2.6.32.45/fs/proc/task_nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/proc/task_nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/proc/task_nommu.c linux-2.6.32.46/fs/proc/task_nommu.c
+--- linux-2.6.32.46/fs/proc/task_nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/task_nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
@@ -45614,9 +48371,9 @@ diff -urNp linux-2.6.32.45/fs/proc/task_nommu.c linux-2.6.32.45/fs/proc/task_nom
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-2.6.32.45/fs/readdir.c linux-2.6.32.45/fs/readdir.c
---- linux-2.6.32.45/fs/readdir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/readdir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/readdir.c linux-2.6.32.46/fs/readdir.c
+--- linux-2.6.32.46/fs/readdir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/readdir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -45706,9 +48463,9 @@ diff -urNp linux-2.6.32.45/fs/readdir.c linux-2.6.32.45/fs/readdir.c
  	buf.count = count;
  	buf.error = 0;
  
-diff -urNp linux-2.6.32.45/fs/reiserfs/dir.c linux-2.6.32.45/fs/reiserfs/dir.c
---- linux-2.6.32.45/fs/reiserfs/dir.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/dir.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/dir.c linux-2.6.32.46/fs/reiserfs/dir.c
+--- linux-2.6.32.46/fs/reiserfs/dir.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/dir.c	2011-05-16 21:46:57.000000000 -0400
 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
  	struct reiserfs_dir_entry de;
  	int ret = 0;
@@ -45718,9 +48475,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/dir.c linux-2.6.32.45/fs/reiserfs/dir.c
  	reiserfs_write_lock(inode->i_sb);
  
  	reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-2.6.32.45/fs/reiserfs/do_balan.c linux-2.6.32.45/fs/reiserfs/do_balan.c
---- linux-2.6.32.45/fs/reiserfs/do_balan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/do_balan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/do_balan.c linux-2.6.32.46/fs/reiserfs/do_balan.c
+--- linux-2.6.32.46/fs/reiserfs/do_balan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/do_balan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
@@ -45730,9 +48487,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/do_balan.c linux-2.6.32.45/fs/reiserfs/do
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.32.45/fs/reiserfs/item_ops.c linux-2.6.32.45/fs/reiserfs/item_ops.c
---- linux-2.6.32.45/fs/reiserfs/item_ops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/item_ops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/item_ops.c linux-2.6.32.46/fs/reiserfs/item_ops.c
+--- linux-2.6.32.46/fs/reiserfs/item_ops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/item_ops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
  			 vi->vi_index, vi->vi_type, vi->vi_ih);
  }
@@ -45787,9 +48544,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/item_ops.c linux-2.6.32.45/fs/reiserfs/it
  	&stat_data_ops,
  	&indirect_ops,
  	&direct_ops,
-diff -urNp linux-2.6.32.45/fs/reiserfs/journal.c linux-2.6.32.45/fs/reiserfs/journal.c
---- linux-2.6.32.45/fs/reiserfs/journal.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/journal.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/journal.c linux-2.6.32.46/fs/reiserfs/journal.c
+--- linux-2.6.32.46/fs/reiserfs/journal.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/journal.c	2011-05-16 21:46:57.000000000 -0400
 @@ -2329,6 +2329,8 @@ static struct buffer_head *reiserfs_brea
  	struct buffer_head *bh;
  	int i, j;
@@ -45799,9 +48556,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/journal.c linux-2.6.32.45/fs/reiserfs/jou
  	bh = __getblk(dev, block, bufsize);
  	if (buffer_uptodate(bh))
  		return (bh);
-diff -urNp linux-2.6.32.45/fs/reiserfs/namei.c linux-2.6.32.45/fs/reiserfs/namei.c
---- linux-2.6.32.45/fs/reiserfs/namei.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/namei.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/namei.c linux-2.6.32.46/fs/reiserfs/namei.c
+--- linux-2.6.32.46/fs/reiserfs/namei.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/namei.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1214,6 +1214,8 @@ static int reiserfs_rename(struct inode 
  	unsigned long savelink = 1;
  	struct timespec ctime;
@@ -45811,9 +48568,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/namei.c linux-2.6.32.45/fs/reiserfs/namei
  	/* three balancings: (1) old name removal, (2) new name insertion
  	   and (3) maybe "save" link insertion
  	   stat data updates: (1) old directory,
-diff -urNp linux-2.6.32.45/fs/reiserfs/procfs.c linux-2.6.32.45/fs/reiserfs/procfs.c
---- linux-2.6.32.45/fs/reiserfs/procfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/procfs.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/procfs.c linux-2.6.32.46/fs/reiserfs/procfs.c
+--- linux-2.6.32.46/fs/reiserfs/procfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/procfs.c	2011-05-16 21:46:57.000000000 -0400
 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -45832,9 +48589,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/procfs.c linux-2.6.32.45/fs/reiserfs/proc
  	seq_printf(m,		/* on-disk fields */
  		   "jp_journal_1st_block: \t%i\n"
  		   "jp_journal_dev: \t%s[%x]\n"
-diff -urNp linux-2.6.32.45/fs/reiserfs/stree.c linux-2.6.32.45/fs/reiserfs/stree.c
---- linux-2.6.32.45/fs/reiserfs/stree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/stree.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/stree.c linux-2.6.32.46/fs/reiserfs/stree.c
+--- linux-2.6.32.46/fs/reiserfs/stree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/stree.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1159,6 +1159,8 @@ int reiserfs_delete_item(struct reiserfs
  	int iter = 0;
  #endif
@@ -45880,9 +48637,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/stree.c linux-2.6.32.45/fs/reiserfs/stree
  	BUG_ON(!th->t_trans_id);
  
  	if (inode) {		/* Do we count quotas for item? */
-diff -urNp linux-2.6.32.45/fs/reiserfs/super.c linux-2.6.32.45/fs/reiserfs/super.c
---- linux-2.6.32.45/fs/reiserfs/super.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/reiserfs/super.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/reiserfs/super.c linux-2.6.32.46/fs/reiserfs/super.c
+--- linux-2.6.32.46/fs/reiserfs/super.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/reiserfs/super.c	2011-05-16 21:46:57.000000000 -0400
 @@ -912,6 +912,8 @@ static int reiserfs_parse_options(struct
  		{.option_name = NULL}
  	};
@@ -45892,9 +48649,9 @@ diff -urNp linux-2.6.32.45/fs/reiserfs/super.c linux-2.6.32.45/fs/reiserfs/super
  	*blocks = 0;
  	if (!options || !*options)
  		/* use default configuration: create tails, journaling on, no
-diff -urNp linux-2.6.32.45/fs/select.c linux-2.6.32.45/fs/select.c
---- linux-2.6.32.45/fs/select.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/select.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/select.c linux-2.6.32.46/fs/select.c
+--- linux-2.6.32.46/fs/select.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/select.c	2011-05-16 21:46:57.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -45931,9 +48688,9 @@ diff -urNp linux-2.6.32.45/fs/select.c linux-2.6.32.45/fs/select.c
  	if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.45/fs/seq_file.c linux-2.6.32.45/fs/seq_file.c
---- linux-2.6.32.45/fs/seq_file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/seq_file.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/seq_file.c linux-2.6.32.46/fs/seq_file.c
+--- linux-2.6.32.46/fs/seq_file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/seq_file.c	2011-08-23 21:22:32.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -45983,9 +48740,9 @@ diff -urNp linux-2.6.32.45/fs/seq_file.c linux-2.6.32.45/fs/seq_file.c
  	int res = -ENOMEM;
  
  	if (op) {
-diff -urNp linux-2.6.32.45/fs/smbfs/proc.c linux-2.6.32.45/fs/smbfs/proc.c
---- linux-2.6.32.45/fs/smbfs/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/smbfs/proc.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/smbfs/proc.c linux-2.6.32.46/fs/smbfs/proc.c
+--- linux-2.6.32.46/fs/smbfs/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/smbfs/proc.c	2011-08-05 20:33:55.000000000 -0400
 @@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info *
  
  out:
@@ -46019,9 +48776,9 @@ diff -urNp linux-2.6.32.45/fs/smbfs/proc.c linux-2.6.32.45/fs/smbfs/proc.c
  }
  
  /* < LANMAN2 */
-diff -urNp linux-2.6.32.45/fs/smbfs/symlink.c linux-2.6.32.45/fs/smbfs/symlink.c
---- linux-2.6.32.45/fs/smbfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/smbfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/smbfs/symlink.c linux-2.6.32.46/fs/smbfs/symlink.c
+--- linux-2.6.32.46/fs/smbfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/smbfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
  
  static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -46031,9 +48788,9 @@ diff -urNp linux-2.6.32.45/fs/smbfs/symlink.c linux-2.6.32.45/fs/smbfs/symlink.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-diff -urNp linux-2.6.32.45/fs/splice.c linux-2.6.32.45/fs/splice.c
---- linux-2.6.32.45/fs/splice.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/splice.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/splice.c linux-2.6.32.46/fs/splice.c
+--- linux-2.6.32.46/fs/splice.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/splice.c	2011-05-16 21:46:57.000000000 -0400
 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -46199,9 +48956,9 @@ diff -urNp linux-2.6.32.45/fs/splice.c linux-2.6.32.45/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-2.6.32.45/fs/sysfs/file.c linux-2.6.32.45/fs/sysfs/file.c
---- linux-2.6.32.45/fs/sysfs/file.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/sysfs/file.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/sysfs/file.c linux-2.6.32.46/fs/sysfs/file.c
+--- linux-2.6.32.46/fs/sysfs/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/sysfs/file.c	2011-05-04 17:56:20.000000000 -0400
 @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -46283,9 +49040,9 @@ diff -urNp linux-2.6.32.45/fs/sysfs/file.c linux-2.6.32.45/fs/sysfs/file.c
  		wake_up_interruptible(&od->poll);
  	}
  
-diff -urNp linux-2.6.32.45/fs/sysfs/mount.c linux-2.6.32.45/fs/sysfs/mount.c
---- linux-2.6.32.45/fs/sysfs/mount.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/sysfs/mount.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/sysfs/mount.c linux-2.6.32.46/fs/sysfs/mount.c
+--- linux-2.6.32.46/fs/sysfs/mount.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/sysfs/mount.c	2011-04-17 15:56:46.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -46298,9 +49055,9 @@ diff -urNp linux-2.6.32.45/fs/sysfs/mount.c linux-2.6.32.45/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-2.6.32.45/fs/sysfs/symlink.c linux-2.6.32.45/fs/sysfs/symlink.c
---- linux-2.6.32.45/fs/sysfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/sysfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/sysfs/symlink.c linux-2.6.32.46/fs/sysfs/symlink.c
+--- linux-2.6.32.46/fs/sysfs/symlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/sysfs/symlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -46310,9 +49067,9 @@ diff -urNp linux-2.6.32.45/fs/sysfs/symlink.c linux-2.6.32.45/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.32.45/fs/udf/balloc.c linux-2.6.32.45/fs/udf/balloc.c
---- linux-2.6.32.45/fs/udf/balloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/udf/balloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/udf/balloc.c linux-2.6.32.46/fs/udf/balloc.c
+--- linux-2.6.32.46/fs/udf/balloc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/udf/balloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
  
  	mutex_lock(&sbi->s_alloc_mutex);
@@ -46335,9 +49092,9 @@ diff -urNp linux-2.6.32.45/fs/udf/balloc.c linux-2.6.32.45/fs/udf/balloc.c
  		udf_debug("%d < %d || %d + %d > %d\n",
  			  bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
  			  partmap->s_partition_len);
-diff -urNp linux-2.6.32.45/fs/udf/inode.c linux-2.6.32.45/fs/udf/inode.c
---- linux-2.6.32.45/fs/udf/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/udf/inode.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/udf/inode.c linux-2.6.32.46/fs/udf/inode.c
+--- linux-2.6.32.46/fs/udf/inode.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/udf/inode.c	2011-05-16 21:46:57.000000000 -0400
 @@ -484,6 +484,8 @@ static struct buffer_head *inode_getblk(
  	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
  	int lastblock = 0;
@@ -46347,9 +49104,9 @@ diff -urNp linux-2.6.32.45/fs/udf/inode.c linux-2.6.32.45/fs/udf/inode.c
  	prev_epos.offset = udf_file_entry_alloc_offset(inode);
  	prev_epos.block = iinfo->i_location;
  	prev_epos.bh = NULL;
-diff -urNp linux-2.6.32.45/fs/udf/misc.c linux-2.6.32.45/fs/udf/misc.c
---- linux-2.6.32.45/fs/udf/misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/udf/misc.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/udf/misc.c linux-2.6.32.46/fs/udf/misc.c
+--- linux-2.6.32.46/fs/udf/misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/udf/misc.c	2011-04-23 12:56:11.000000000 -0400
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -46359,9 +49116,9 @@ diff -urNp linux-2.6.32.45/fs/udf/misc.c linux-2.6.32.45/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-2.6.32.45/fs/utimes.c linux-2.6.32.45/fs/utimes.c
---- linux-2.6.32.45/fs/utimes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/utimes.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/utimes.c linux-2.6.32.46/fs/utimes.c
+--- linux-2.6.32.46/fs/utimes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/utimes.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -46383,9 +49140,9 @@ diff -urNp linux-2.6.32.45/fs/utimes.c linux-2.6.32.45/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.32.45/fs/xattr_acl.c linux-2.6.32.45/fs/xattr_acl.c
---- linux-2.6.32.45/fs/xattr_acl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/xattr_acl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xattr_acl.c linux-2.6.32.46/fs/xattr_acl.c
+--- linux-2.6.32.46/fs/xattr_acl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xattr_acl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -46397,9 +49154,9 @@ diff -urNp linux-2.6.32.45/fs/xattr_acl.c linux-2.6.32.45/fs/xattr_acl.c
  	int count;
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
-diff -urNp linux-2.6.32.45/fs/xattr.c linux-2.6.32.45/fs/xattr.c
---- linux-2.6.32.45/fs/xattr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/xattr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xattr.c linux-2.6.32.46/fs/xattr.c
+--- linux-2.6.32.46/fs/xattr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xattr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -46462,9 +49219,9 @@ diff -urNp linux-2.6.32.45/fs/xattr.c linux-2.6.32.45/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
  	xfs_fsop_geom_t		  fsgeo;
  	int			  error;
@@ -46473,9 +49230,9 @@ diff -urNp linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.45/fs/xfs
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
  	if (error)
  		return -error;
-diff -urNp linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 20:07:09.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 20:07:09.000000000 -0400
 @@ -134,7 +134,7 @@ xfs_find_handle(
  	}
  
@@ -46503,9 +49260,9 @@ diff -urNp linux-2.6.32.45/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.45/fs/xfs/l
  	int			error;
  
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
-diff -urNp linux-2.6.32.45/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.45/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.45/fs/xfs/linux-2.6/xfs_iops.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/xfs/linux-2.6/xfs_iops.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c	2011-04-17 15:56:46.000000000 -0400
 @@ -468,7 +468,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
@@ -46515,9 +49272,9 @@ diff -urNp linux-2.6.32.45/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.45/fs/xfs/li
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-2.6.32.45/fs/xfs/xfs_bmap.c linux-2.6.32.45/fs/xfs/xfs_bmap.c
---- linux-2.6.32.45/fs/xfs/xfs_bmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/xfs/xfs_bmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xfs/xfs_bmap.c linux-2.6.32.46/fs/xfs/xfs_bmap.c
+--- linux-2.6.32.46/fs/xfs/xfs_bmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xfs/xfs_bmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
@@ -46527,9 +49284,9 @@ diff -urNp linux-2.6.32.45/fs/xfs/xfs_bmap.c linux-2.6.32.45/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  #if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.32.45/fs/xfs/xfs_dir2_sf.c linux-2.6.32.45/fs/xfs/xfs_dir2_sf.c
---- linux-2.6.32.45/fs/xfs/xfs_dir2_sf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/fs/xfs/xfs_dir2_sf.c	2011-04-18 22:07:30.000000000 -0400
+diff -urNp linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c
+--- linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c	2011-04-18 22:07:30.000000000 -0400
 @@ -779,7 +779,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -46547,9 +49304,9 @@ diff -urNp linux-2.6.32.45/fs/xfs/xfs_dir2_sf.c linux-2.6.32.45/fs/xfs/xfs_dir2_
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-2.6.32.45/grsecurity/gracl_alloc.c linux-2.6.32.45/grsecurity/gracl_alloc.c
---- linux-2.6.32.45/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_alloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_alloc.c linux-2.6.32.46/grsecurity/gracl_alloc.c
+--- linux-2.6.32.46/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_alloc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46656,9 +49413,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_alloc.c linux-2.6.32.45/grsecurity/g
 +	else
 +		return 1;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/gracl.c linux-2.6.32.45/grsecurity/gracl.c
---- linux-2.6.32.45/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl.c	2011-07-14 20:02:48.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
+--- linux-2.6.32.46/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl.c	2011-07-14 20:02:48.000000000 -0400
 @@ -0,0 +1,4082 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -50742,9 +53499,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl.c linux-2.6.32.45/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-2.6.32.45/grsecurity/gracl_cap.c linux-2.6.32.45/grsecurity/gracl_cap.c
---- linux-2.6.32.45/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_cap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_cap.c linux-2.6.32.46/grsecurity/gracl_cap.c
+--- linux-2.6.32.46/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_cap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,138 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -50884,9 +53641,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_cap.c linux-2.6.32.45/grsecurity/gra
 +	return 0;
 +}
 +
-diff -urNp linux-2.6.32.45/grsecurity/gracl_fs.c linux-2.6.32.45/grsecurity/gracl_fs.c
---- linux-2.6.32.45/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_fs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_fs.c linux-2.6.32.46/grsecurity/gracl_fs.c
+--- linux-2.6.32.46/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_fs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51319,9 +54076,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_fs.c linux-2.6.32.45/grsecurity/grac
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/gracl_ip.c linux-2.6.32.45/grsecurity/gracl_ip.c
---- linux-2.6.32.45/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_ip.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_ip.c linux-2.6.32.46/grsecurity/gracl_ip.c
+--- linux-2.6.32.46/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_ip.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,382 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -51705,9 +54462,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_ip.c linux-2.6.32.45/grsecurity/grac
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-2.6.32.45/grsecurity/gracl_learn.c linux-2.6.32.45/grsecurity/gracl_learn.c
---- linux-2.6.32.45/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_learn.c	2011-07-14 21:02:03.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_learn.c linux-2.6.32.46/grsecurity/gracl_learn.c
+--- linux-2.6.32.46/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_learn.c	2011-07-14 21:02:03.000000000 -0400
 @@ -0,0 +1,208 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -51917,9 +54674,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_learn.c linux-2.6.32.45/grsecurity/g
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-2.6.32.45/grsecurity/gracl_res.c linux-2.6.32.45/grsecurity/gracl_res.c
---- linux-2.6.32.45/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_res.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_res.c linux-2.6.32.46/grsecurity/gracl_res.c
+--- linux-2.6.32.46/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_res.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,67 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51988,9 +54745,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_res.c linux-2.6.32.45/grsecurity/gra
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/gracl_segv.c linux-2.6.32.45/grsecurity/gracl_segv.c
---- linux-2.6.32.45/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_segv.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_segv.c linux-2.6.32.46/grsecurity/gracl_segv.c
+--- linux-2.6.32.46/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_segv.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,284 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -52276,9 +55033,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_segv.c linux-2.6.32.45/grsecurity/gr
 +
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/gracl_shm.c linux-2.6.32.45/grsecurity/gracl_shm.c
---- linux-2.6.32.45/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/gracl_shm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/gracl_shm.c linux-2.6.32.46/grsecurity/gracl_shm.c
+--- linux-2.6.32.46/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_shm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -52320,9 +55077,9 @@ diff -urNp linux-2.6.32.45/grsecurity/gracl_shm.c linux-2.6.32.45/grsecurity/gra
 +
 +	return 1;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_chdir.c linux-2.6.32.45/grsecurity/grsec_chdir.c
---- linux-2.6.32.45/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_chdir.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_chdir.c linux-2.6.32.46/grsecurity/grsec_chdir.c
+--- linux-2.6.32.46/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_chdir.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52343,9 +55100,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_chdir.c linux-2.6.32.45/grsecurity/g
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_chroot.c linux-2.6.32.45/grsecurity/grsec_chroot.c
---- linux-2.6.32.45/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_chroot.c	2011-07-18 17:14:10.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_chroot.c linux-2.6.32.46/grsecurity/grsec_chroot.c
+--- linux-2.6.32.46/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_chroot.c	2011-07-18 17:14:10.000000000 -0400
 @@ -0,0 +1,384 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -52731,9 +55488,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_chroot.c linux-2.6.32.45/grsecurity/
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-2.6.32.45/grsecurity/grsec_disabled.c linux-2.6.32.45/grsecurity/grsec_disabled.c
---- linux-2.6.32.45/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_disabled.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_disabled.c linux-2.6.32.46/grsecurity/grsec_disabled.c
+--- linux-2.6.32.46/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_disabled.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -53182,9 +55939,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_disabled.c linux-2.6.32.45/grsecurit
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-2.6.32.45/grsecurity/grsec_exec.c linux-2.6.32.45/grsecurity/grsec_exec.c
---- linux-2.6.32.45/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_exec.c	2011-08-11 19:57:19.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_exec.c linux-2.6.32.46/grsecurity/grsec_exec.c
+--- linux-2.6.32.46/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_exec.c	2011-08-11 19:57:19.000000000 -0400
 @@ -0,0 +1,132 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53318,9 +56075,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_exec.c linux-2.6.32.45/grsecurity/gr
 +	return;
 +}
 +#endif
-diff -urNp linux-2.6.32.45/grsecurity/grsec_fifo.c linux-2.6.32.45/grsecurity/grsec_fifo.c
---- linux-2.6.32.45/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_fifo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_fifo.c linux-2.6.32.46/grsecurity/grsec_fifo.c
+--- linux-2.6.32.46/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_fifo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53346,9 +56103,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_fifo.c linux-2.6.32.45/grsecurity/gr
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_fork.c linux-2.6.32.45/grsecurity/grsec_fork.c
---- linux-2.6.32.45/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_fork.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_fork.c linux-2.6.32.46/grsecurity/grsec_fork.c
+--- linux-2.6.32.46/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_fork.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53373,9 +56130,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_fork.c linux-2.6.32.45/grsecurity/gr
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_init.c linux-2.6.32.45/grsecurity/grsec_init.c
---- linux-2.6.32.45/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_init.c	2011-08-11 19:57:42.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_init.c linux-2.6.32.46/grsecurity/grsec_init.c
+--- linux-2.6.32.46/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_init.c	2011-08-11 19:57:42.000000000 -0400
 @@ -0,0 +1,270 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53647,9 +56404,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_init.c linux-2.6.32.45/grsecurity/gr
 +
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_link.c linux-2.6.32.45/grsecurity/grsec_link.c
---- linux-2.6.32.45/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_link.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_link.c linux-2.6.32.46/grsecurity/grsec_link.c
+--- linux-2.6.32.46/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_link.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53694,9 +56451,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_link.c linux-2.6.32.45/grsecurity/gr
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_log.c linux-2.6.32.45/grsecurity/grsec_log.c
---- linux-2.6.32.45/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_log.c	2011-05-10 21:58:49.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_log.c linux-2.6.32.46/grsecurity/grsec_log.c
+--- linux-2.6.32.46/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_log.c	2011-05-10 21:58:49.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54008,9 +56765,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_log.c linux-2.6.32.45/grsecurity/grs
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_mem.c linux-2.6.32.45/grsecurity/grsec_mem.c
---- linux-2.6.32.45/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_mem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_mem.c linux-2.6.32.46/grsecurity/grsec_mem.c
+--- linux-2.6.32.46/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_mem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54045,9 +56802,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_mem.c linux-2.6.32.45/grsecurity/grs
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_mount.c linux-2.6.32.45/grsecurity/grsec_mount.c
---- linux-2.6.32.45/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_mount.c	2011-06-20 19:47:03.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_mount.c linux-2.6.32.46/grsecurity/grsec_mount.c
+--- linux-2.6.32.46/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_mount.c	2011-06-20 19:47:03.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54111,9 +56868,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_mount.c linux-2.6.32.45/grsecurity/g
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_pax.c linux-2.6.32.45/grsecurity/grsec_pax.c
---- linux-2.6.32.45/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_pax.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_pax.c linux-2.6.32.46/grsecurity/grsec_pax.c
+--- linux-2.6.32.46/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_pax.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54151,9 +56908,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_pax.c linux-2.6.32.45/grsecurity/grs
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_ptrace.c linux-2.6.32.45/grsecurity/grsec_ptrace.c
---- linux-2.6.32.45/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_ptrace.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_ptrace.c linux-2.6.32.46/grsecurity/grsec_ptrace.c
+--- linux-2.6.32.46/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_ptrace.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54169,9 +56926,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_ptrace.c linux-2.6.32.45/grsecurity/
 +#endif
 +	return;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_sig.c linux-2.6.32.45/grsecurity/grsec_sig.c
---- linux-2.6.32.45/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_sig.c	2011-06-29 19:40:31.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_sig.c linux-2.6.32.46/grsecurity/grsec_sig.c
+--- linux-2.6.32.46/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_sig.c	2011-06-29 19:40:31.000000000 -0400
 @@ -0,0 +1,205 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54378,9 +57135,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_sig.c linux-2.6.32.45/grsecurity/grs
 +#endif
 +	return 0;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_sock.c linux-2.6.32.45/grsecurity/grsec_sock.c
---- linux-2.6.32.45/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_sock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_sock.c linux-2.6.32.46/grsecurity/grsec_sock.c
+--- linux-2.6.32.46/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_sock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,275 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -54657,9 +57414,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_sock.c linux-2.6.32.45/grsecurity/gr
 +	return current_cap();
 +#endif
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsec_sysctl.c linux-2.6.32.45/grsecurity/grsec_sysctl.c
---- linux-2.6.32.45/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_sysctl.c	2011-08-11 19:57:54.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_sysctl.c linux-2.6.32.46/grsecurity/grsec_sysctl.c
+--- linux-2.6.32.46/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_sysctl.c	2011-08-11 19:57:54.000000000 -0400
 @@ -0,0 +1,479 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55140,9 +57897,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_sysctl.c linux-2.6.32.45/grsecurity/
 +	{ .ctl_name = 0 }
 +};
 +#endif
-diff -urNp linux-2.6.32.45/grsecurity/grsec_time.c linux-2.6.32.45/grsecurity/grsec_time.c
---- linux-2.6.32.45/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_time.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_time.c linux-2.6.32.46/grsecurity/grsec_time.c
+--- linux-2.6.32.46/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_time.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55160,9 +57917,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_time.c linux-2.6.32.45/grsecurity/gr
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-2.6.32.45/grsecurity/grsec_tpe.c linux-2.6.32.45/grsecurity/grsec_tpe.c
---- linux-2.6.32.45/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsec_tpe.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsec_tpe.c linux-2.6.32.46/grsecurity/grsec_tpe.c
+--- linux-2.6.32.46/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsec_tpe.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -55203,9 +57960,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsec_tpe.c linux-2.6.32.45/grsecurity/grs
 +#endif
 +	return 1;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/grsum.c linux-2.6.32.45/grsecurity/grsum.c
---- linux-2.6.32.45/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/grsum.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/grsum.c linux-2.6.32.46/grsecurity/grsum.c
+--- linux-2.6.32.46/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/grsum.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -55268,9 +58025,9 @@ diff -urNp linux-2.6.32.45/grsecurity/grsum.c linux-2.6.32.45/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-2.6.32.45/grsecurity/Kconfig linux-2.6.32.45/grsecurity/Kconfig
---- linux-2.6.32.45/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/Kconfig	2011-08-17 19:04:25.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/Kconfig linux-2.6.32.46/grsecurity/Kconfig
+--- linux-2.6.32.46/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/Kconfig	2011-08-17 19:04:25.000000000 -0400
 @@ -0,0 +1,1037 @@
 +#
 +# grecurity configuration
@@ -56309,9 +59066,9 @@ diff -urNp linux-2.6.32.45/grsecurity/Kconfig linux-2.6.32.45/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-2.6.32.45/grsecurity/Makefile linux-2.6.32.45/grsecurity/Makefile
---- linux-2.6.32.45/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/grsecurity/Makefile	2011-08-21 18:54:34.000000000 -0400
+diff -urNp linux-2.6.32.46/grsecurity/Makefile linux-2.6.32.46/grsecurity/Makefile
+--- linux-2.6.32.46/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/Makefile	2011-08-21 18:54:34.000000000 -0400
 @@ -0,0 +1,34 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -56347,9 +59104,9 @@ diff -urNp linux-2.6.32.45/grsecurity/Makefile linux-2.6.32.45/grsecurity/Makefi
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-2.6.32.45/include/acpi/acpi_bus.h linux-2.6.32.45/include/acpi/acpi_bus.h
---- linux-2.6.32.45/include/acpi/acpi_bus.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/acpi/acpi_bus.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/acpi/acpi_bus.h linux-2.6.32.46/include/acpi/acpi_bus.h
+--- linux-2.6.32.46/include/acpi/acpi_bus.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/acpi/acpi_bus.h	2011-08-05 20:33:55.000000000 -0400
 @@ -107,7 +107,7 @@ struct acpi_device_ops {
  	acpi_op_bind bind;
  	acpi_op_unbind unbind;
@@ -56359,9 +59116,9 @@ diff -urNp linux-2.6.32.45/include/acpi/acpi_bus.h linux-2.6.32.45/include/acpi/
  
  #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
  
-diff -urNp linux-2.6.32.45/include/acpi/acpi_drivers.h linux-2.6.32.45/include/acpi/acpi_drivers.h
---- linux-2.6.32.45/include/acpi/acpi_drivers.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/acpi/acpi_drivers.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/acpi/acpi_drivers.h linux-2.6.32.46/include/acpi/acpi_drivers.h
+--- linux-2.6.32.46/include/acpi/acpi_drivers.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/acpi/acpi_drivers.h	2011-04-17 15:56:46.000000000 -0400
 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
                                    Dock Station
    -------------------------------------------------------------------------- */
@@ -56391,9 +59148,9 @@ diff -urNp linux-2.6.32.45/include/acpi/acpi_drivers.h linux-2.6.32.45/include/a
  					       void *context)
  {
  	return -ENODEV;
-diff -urNp linux-2.6.32.45/include/asm-generic/atomic-long.h linux-2.6.32.45/include/asm-generic/atomic-long.h
---- linux-2.6.32.45/include/asm-generic/atomic-long.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/atomic-long.h	2011-07-13 22:21:25.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/atomic-long.h linux-2.6.32.46/include/asm-generic/atomic-long.h
+--- linux-2.6.32.46/include/asm-generic/atomic-long.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/atomic-long.h	2011-07-13 22:21:25.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -56660,9 +59417,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/atomic-long.h linux-2.6.32.45/inc
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-2.6.32.45/include/asm-generic/bug.h linux-2.6.32.45/include/asm-generic/bug.h
---- linux-2.6.32.45/include/asm-generic/bug.h	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/bug.h	2011-08-21 17:56:07.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/bug.h linux-2.6.32.46/include/asm-generic/bug.h
+--- linux-2.6.32.46/include/asm-generic/bug.h	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/bug.h	2011-08-21 17:56:07.000000000 -0400
 @@ -105,11 +105,11 @@ extern void warn_slowpath_null(const cha
  
  #else /* !CONFIG_BUG */
@@ -56677,9 +59434,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/bug.h linux-2.6.32.45/include/asm
  #endif
  
  #ifndef HAVE_ARCH_WARN_ON
-diff -urNp linux-2.6.32.45/include/asm-generic/cache.h linux-2.6.32.45/include/asm-generic/cache.h
---- linux-2.6.32.45/include/asm-generic/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/cache.h	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/cache.h linux-2.6.32.46/include/asm-generic/cache.h
+--- linux-2.6.32.46/include/asm-generic/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/cache.h	2011-07-06 19:53:33.000000000 -0400
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -56690,9 +59447,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/cache.h linux-2.6.32.45/include/a
 +#define L1_CACHE_BYTES		(1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-2.6.32.45/include/asm-generic/dma-mapping-common.h linux-2.6.32.45/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.45/include/asm-generic/dma-mapping-common.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/dma-mapping-common.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/dma-mapping-common.h linux-2.6.32.46/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.32.46/include/asm-generic/dma-mapping-common.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/dma-mapping-common.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
  					      enum dma_data_direction dir,
  					      struct dma_attrs *attrs)
@@ -56801,9 +59558,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/dma-mapping-common.h linux-2.6.32
  
  	BUG_ON(!valid_dma_direction(dir));
  	if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.32.45/include/asm-generic/emergency-restart.h linux-2.6.32.45/include/asm-generic/emergency-restart.h
---- linux-2.6.32.45/include/asm-generic/emergency-restart.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/emergency-restart.h	2011-08-21 19:17:17.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/emergency-restart.h linux-2.6.32.46/include/asm-generic/emergency-restart.h
+--- linux-2.6.32.46/include/asm-generic/emergency-restart.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/emergency-restart.h	2011-08-21 19:17:17.000000000 -0400
 @@ -1,7 +1,7 @@
  #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
  #define _ASM_GENERIC_EMERGENCY_RESTART_H
@@ -56813,9 +59570,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/emergency-restart.h linux-2.6.32.
  {
  	machine_restart(NULL);
  }
-diff -urNp linux-2.6.32.45/include/asm-generic/futex.h linux-2.6.32.45/include/asm-generic/futex.h
---- linux-2.6.32.45/include/asm-generic/futex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/futex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/futex.h linux-2.6.32.46/include/asm-generic/futex.h
+--- linux-2.6.32.46/include/asm-generic/futex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/futex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <asm/errno.h>
  
@@ -56834,9 +59591,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/futex.h linux-2.6.32.45/include/a
  {
  	return -ENOSYS;
  }
-diff -urNp linux-2.6.32.45/include/asm-generic/int-l64.h linux-2.6.32.45/include/asm-generic/int-l64.h
---- linux-2.6.32.45/include/asm-generic/int-l64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/int-l64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/int-l64.h linux-2.6.32.46/include/asm-generic/int-l64.h
+--- linux-2.6.32.46/include/asm-generic/int-l64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/int-l64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -56846,9 +59603,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/int-l64.h linux-2.6.32.45/include
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.32.45/include/asm-generic/int-ll64.h linux-2.6.32.45/include/asm-generic/int-ll64.h
---- linux-2.6.32.45/include/asm-generic/int-ll64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/int-ll64.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/int-ll64.h linux-2.6.32.46/include/asm-generic/int-ll64.h
+--- linux-2.6.32.46/include/asm-generic/int-ll64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/int-ll64.h	2011-04-17 15:56:46.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -56858,9 +59615,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/int-ll64.h linux-2.6.32.45/includ
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-2.6.32.45/include/asm-generic/kmap_types.h linux-2.6.32.45/include/asm-generic/kmap_types.h
---- linux-2.6.32.45/include/asm-generic/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/kmap_types.h linux-2.6.32.46/include/asm-generic/kmap_types.h
+--- linux-2.6.32.46/include/asm-generic/kmap_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/kmap_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -28,7 +28,8 @@ KMAP_D(15)	KM_UML_USERCOPY,
  KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
@@ -56871,9 +59628,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/kmap_types.h linux-2.6.32.45/incl
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.32.45/include/asm-generic/pgtable.h linux-2.6.32.45/include/asm-generic/pgtable.h
---- linux-2.6.32.45/include/asm-generic/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/pgtable.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/pgtable.h linux-2.6.32.46/include/asm-generic/pgtable.h
+--- linux-2.6.32.46/include/asm-generic/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/pgtable.h	2011-04-17 15:56:46.000000000 -0400
 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
  				unsigned long size);
  #endif
@@ -56889,9 +59646,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/pgtable.h linux-2.6.32.45/include
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.32.45/include/asm-generic/pgtable-nopmd.h linux-2.6.32.45/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.32.45/include/asm-generic/pgtable-nopmd.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/pgtable-nopmd.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -56928,9 +59685,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/pgtable-nopmd.h linux-2.6.32.45/i
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.32.45/include/asm-generic/pgtable-nopud.h linux-2.6.32.45/include/asm-generic/pgtable-nopud.h
---- linux-2.6.32.45/include/asm-generic/pgtable-nopud.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/pgtable-nopud.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopud.h linux-2.6.32.46/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.32.46/include/asm-generic/pgtable-nopud.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/pgtable-nopud.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -56961,9 +59718,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/pgtable-nopud.h linux-2.6.32.45/i
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.32.45/include/asm-generic/vmlinux.lds.h linux-2.6.32.45/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.45/include/asm-generic/vmlinux.lds.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/asm-generic/vmlinux.lds.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/asm-generic/vmlinux.lds.h linux-2.6.32.46/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.32.46/include/asm-generic/vmlinux.lds.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/vmlinux.lds.h	2011-04-17 15:56:46.000000000 -0400
 @@ -199,6 +199,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
@@ -57002,9 +59759,9 @@ diff -urNp linux-2.6.32.45/include/asm-generic/vmlinux.lds.h linux-2.6.32.45/inc
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.32.45/include/drm/drm_crtc_helper.h linux-2.6.32.45/include/drm/drm_crtc_helper.h
---- linux-2.6.32.45/include/drm/drm_crtc_helper.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/drm/drm_crtc_helper.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/drm/drm_crtc_helper.h linux-2.6.32.46/include/drm/drm_crtc_helper.h
+--- linux-2.6.32.46/include/drm/drm_crtc_helper.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/drm/drm_crtc_helper.h	2011-08-05 20:33:55.000000000 -0400
 @@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
  
  	/* reload the current crtc LUT */
@@ -57023,9 +59780,9 @@ diff -urNp linux-2.6.32.45/include/drm/drm_crtc_helper.h linux-2.6.32.45/include
  
  struct drm_connector_helper_funcs {
  	int (*get_modes)(struct drm_connector *connector);
-diff -urNp linux-2.6.32.45/include/drm/drmP.h linux-2.6.32.45/include/drm/drmP.h
---- linux-2.6.32.45/include/drm/drmP.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/drm/drmP.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/drm/drmP.h linux-2.6.32.46/include/drm/drmP.h
+--- linux-2.6.32.46/include/drm/drmP.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/drm/drmP.h	2011-04-17 15:56:46.000000000 -0400
 @@ -71,6 +71,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -57085,9 +59842,9 @@ diff -urNp linux-2.6.32.45/include/drm/drmP.h linux-2.6.32.45/include/drm/drmP.h
  	uint32_t gtt_total;
  	uint32_t invalidate_domains;    /* domains pending invalidation */
  	uint32_t flush_domains;         /* domains pending flush */
-diff -urNp linux-2.6.32.45/include/drm/ttm/ttm_memory.h linux-2.6.32.45/include/drm/ttm/ttm_memory.h
---- linux-2.6.32.45/include/drm/ttm/ttm_memory.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/drm/ttm/ttm_memory.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/drm/ttm/ttm_memory.h linux-2.6.32.46/include/drm/ttm/ttm_memory.h
+--- linux-2.6.32.46/include/drm/ttm/ttm_memory.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/drm/ttm/ttm_memory.h	2011-08-05 20:33:55.000000000 -0400
 @@ -47,7 +47,7 @@
  
  struct ttm_mem_shrink {
@@ -57097,9 +59854,9 @@ diff -urNp linux-2.6.32.45/include/drm/ttm/ttm_memory.h linux-2.6.32.45/include/
  
  /**
   * struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-2.6.32.45/include/linux/a.out.h linux-2.6.32.45/include/linux/a.out.h
---- linux-2.6.32.45/include/linux/a.out.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/a.out.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/a.out.h linux-2.6.32.46/include/linux/a.out.h
+--- linux-2.6.32.46/include/linux/a.out.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/a.out.h	2011-04-17 15:56:46.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -57115,9 +59872,9 @@ diff -urNp linux-2.6.32.45/include/linux/a.out.h linux-2.6.32.45/include/linux/a
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-2.6.32.45/include/linux/atmdev.h linux-2.6.32.45/include/linux/atmdev.h
---- linux-2.6.32.45/include/linux/atmdev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/atmdev.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/atmdev.h linux-2.6.32.46/include/linux/atmdev.h
+--- linux-2.6.32.46/include/linux/atmdev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/atmdev.h	2011-04-17 15:56:46.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -57127,9 +59884,9 @@ diff -urNp linux-2.6.32.45/include/linux/atmdev.h linux-2.6.32.45/include/linux/
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.32.45/include/linux/backlight.h linux-2.6.32.45/include/linux/backlight.h
---- linux-2.6.32.45/include/linux/backlight.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/backlight.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/backlight.h linux-2.6.32.46/include/linux/backlight.h
+--- linux-2.6.32.46/include/linux/backlight.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/backlight.h	2011-04-17 15:56:46.000000000 -0400
 @@ -36,18 +36,18 @@ struct backlight_device;
  struct fb_info;
  
@@ -57171,9 +59928,9 @@ diff -urNp linux-2.6.32.45/include/linux/backlight.h linux-2.6.32.45/include/lin
  extern void backlight_device_unregister(struct backlight_device *bd);
  extern void backlight_force_update(struct backlight_device *bd,
  				   enum backlight_update_reason reason);
-diff -urNp linux-2.6.32.45/include/linux/binfmts.h linux-2.6.32.45/include/linux/binfmts.h
---- linux-2.6.32.45/include/linux/binfmts.h	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/include/linux/binfmts.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/binfmts.h linux-2.6.32.46/include/linux/binfmts.h
+--- linux-2.6.32.46/include/linux/binfmts.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/include/linux/binfmts.h	2011-04-17 15:56:46.000000000 -0400
 @@ -83,6 +83,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
@@ -57182,9 +59939,9 @@ diff -urNp linux-2.6.32.45/include/linux/binfmts.h linux-2.6.32.45/include/linux
  	unsigned long min_coredump;	/* minimal dump size */
  	int hasvdso;
  };
-diff -urNp linux-2.6.32.45/include/linux/blkdev.h linux-2.6.32.45/include/linux/blkdev.h
---- linux-2.6.32.45/include/linux/blkdev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/blkdev.h	2011-08-26 20:27:21.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/blkdev.h linux-2.6.32.46/include/linux/blkdev.h
+--- linux-2.6.32.46/include/linux/blkdev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/blkdev.h	2011-08-26 20:27:21.000000000 -0400
 @@ -1278,7 +1278,7 @@ struct block_device_operations {
  	int (*revalidate_disk) (struct gendisk *);
  	int (*getgeo)(struct block_device *, struct hd_geometry *);
@@ -57194,9 +59951,9 @@ diff -urNp linux-2.6.32.45/include/linux/blkdev.h linux-2.6.32.45/include/linux/
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
  				 unsigned long);
-diff -urNp linux-2.6.32.45/include/linux/blktrace_api.h linux-2.6.32.45/include/linux/blktrace_api.h
---- linux-2.6.32.45/include/linux/blktrace_api.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/blktrace_api.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/blktrace_api.h linux-2.6.32.46/include/linux/blktrace_api.h
+--- linux-2.6.32.46/include/linux/blktrace_api.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/blktrace_api.h	2011-05-04 17:56:28.000000000 -0400
 @@ -160,7 +160,7 @@ struct blk_trace {
  	struct dentry *dir;
  	struct dentry *dropped_file;
@@ -57206,9 +59963,9 @@ diff -urNp linux-2.6.32.45/include/linux/blktrace_api.h linux-2.6.32.45/include/
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-2.6.32.45/include/linux/byteorder/little_endian.h linux-2.6.32.45/include/linux/byteorder/little_endian.h
---- linux-2.6.32.45/include/linux/byteorder/little_endian.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/byteorder/little_endian.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/byteorder/little_endian.h linux-2.6.32.46/include/linux/byteorder/little_endian.h
+--- linux-2.6.32.46/include/linux/byteorder/little_endian.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/byteorder/little_endian.h	2011-04-17 15:56:46.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -57273,9 +60030,9 @@ diff -urNp linux-2.6.32.45/include/linux/byteorder/little_endian.h linux-2.6.32.
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-2.6.32.45/include/linux/cache.h linux-2.6.32.45/include/linux/cache.h
---- linux-2.6.32.45/include/linux/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/cache.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/cache.h linux-2.6.32.46/include/linux/cache.h
+--- linux-2.6.32.46/include/linux/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/cache.h	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -57287,9 +60044,9 @@ diff -urNp linux-2.6.32.45/include/linux/cache.h linux-2.6.32.45/include/linux/c
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-2.6.32.45/include/linux/capability.h linux-2.6.32.45/include/linux/capability.h
---- linux-2.6.32.45/include/linux/capability.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/capability.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/capability.h linux-2.6.32.46/include/linux/capability.h
+--- linux-2.6.32.46/include/linux/capability.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/capability.h	2011-04-17 15:56:46.000000000 -0400
 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
  	(security_real_capable_noaudit((t), (cap)) == 0)
  
@@ -57298,9 +60055,9 @@ diff -urNp linux-2.6.32.45/include/linux/capability.h linux-2.6.32.45/include/li
  
  /* audit system wants to get cap info from files as well */
  struct dentry;
-diff -urNp linux-2.6.32.45/include/linux/compiler-gcc4.h linux-2.6.32.45/include/linux/compiler-gcc4.h
---- linux-2.6.32.45/include/linux/compiler-gcc4.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/compiler-gcc4.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/compiler-gcc4.h linux-2.6.32.46/include/linux/compiler-gcc4.h
+--- linux-2.6.32.46/include/linux/compiler-gcc4.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/compiler-gcc4.h	2011-08-26 20:19:09.000000000 -0400
 @@ -36,4 +36,16 @@
     the kernel context */
  #define __cold			__attribute__((__cold__))
@@ -57318,9 +60075,9 @@ diff -urNp linux-2.6.32.45/include/linux/compiler-gcc4.h linux-2.6.32.45/include
 +#endif
 +
  #endif
-diff -urNp linux-2.6.32.45/include/linux/compiler.h linux-2.6.32.45/include/linux/compiler.h
---- linux-2.6.32.45/include/linux/compiler.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/compiler.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/compiler.h linux-2.6.32.46/include/linux/compiler.h
+--- linux-2.6.32.46/include/linux/compiler.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/compiler.h	2011-08-26 20:19:09.000000000 -0400
 @@ -247,6 +247,14 @@ void ftrace_likely_update(struct ftrace_
  # define __attribute_const__	/* unimplemented */
  #endif
@@ -57368,9 +60125,9 @@ diff -urNp linux-2.6.32.45/include/linux/compiler.h linux-2.6.32.45/include/linu
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-2.6.32.45/include/linux/crypto.h linux-2.6.32.45/include/linux/crypto.h
---- linux-2.6.32.45/include/linux/crypto.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/crypto.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/crypto.h linux-2.6.32.46/include/linux/crypto.h
+--- linux-2.6.32.46/include/linux/crypto.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/crypto.h	2011-08-05 20:33:55.000000000 -0400
 @@ -394,7 +394,7 @@ struct cipher_tfm {
  	                  const u8 *key, unsigned int keylen);
  	void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -57396,9 +60153,9 @@ diff -urNp linux-2.6.32.45/include/linux/crypto.h linux-2.6.32.45/include/linux/
  
  #define crt_ablkcipher	crt_u.ablkcipher
  #define crt_aead	crt_u.aead
-diff -urNp linux-2.6.32.45/include/linux/dcache.h linux-2.6.32.45/include/linux/dcache.h
---- linux-2.6.32.45/include/linux/dcache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/dcache.h	2011-04-23 13:34:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/dcache.h linux-2.6.32.46/include/linux/dcache.h
+--- linux-2.6.32.46/include/linux/dcache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/dcache.h	2011-04-23 13:34:46.000000000 -0400
 @@ -119,6 +119,8 @@ struct dentry {
  	unsigned char d_iname[DNAME_INLINE_LEN_MIN];	/* small names */
  };
@@ -57408,9 +60165,9 @@ diff -urNp linux-2.6.32.45/include/linux/dcache.h linux-2.6.32.45/include/linux/
  /*
   * dentry->d_lock spinlock nesting subclasses:
   *
-diff -urNp linux-2.6.32.45/include/linux/decompress/mm.h linux-2.6.32.45/include/linux/decompress/mm.h
---- linux-2.6.32.45/include/linux/decompress/mm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/decompress/mm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/decompress/mm.h linux-2.6.32.46/include/linux/decompress/mm.h
+--- linux-2.6.32.46/include/linux/decompress/mm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/decompress/mm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -78,7 +78,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -57420,9 +60177,9 @@ diff -urNp linux-2.6.32.45/include/linux/decompress/mm.h linux-2.6.32.45/include
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.32.45/include/linux/dma-mapping.h linux-2.6.32.45/include/linux/dma-mapping.h
---- linux-2.6.32.45/include/linux/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/dma-mapping.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/dma-mapping.h linux-2.6.32.46/include/linux/dma-mapping.h
+--- linux-2.6.32.46/include/linux/dma-mapping.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/dma-mapping.h	2011-08-26 20:19:09.000000000 -0400
 @@ -16,51 +16,51 @@ enum dma_data_direction {
  };
  
@@ -57490,9 +60247,9 @@ diff -urNp linux-2.6.32.45/include/linux/dma-mapping.h linux-2.6.32.45/include/l
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  
-diff -urNp linux-2.6.32.45/include/linux/dst.h linux-2.6.32.45/include/linux/dst.h
---- linux-2.6.32.45/include/linux/dst.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/dst.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/dst.h linux-2.6.32.46/include/linux/dst.h
+--- linux-2.6.32.46/include/linux/dst.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/dst.h	2011-04-17 15:56:46.000000000 -0400
 @@ -380,7 +380,7 @@ struct dst_node
  	struct thread_pool	*pool;
  
@@ -57502,9 +60259,9 @@ diff -urNp linux-2.6.32.45/include/linux/dst.h linux-2.6.32.45/include/linux/dst
  
  	/*
  	 * How frequently and how many times transaction
-diff -urNp linux-2.6.32.45/include/linux/elf.h linux-2.6.32.45/include/linux/elf.h
---- linux-2.6.32.45/include/linux/elf.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/elf.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/elf.h linux-2.6.32.46/include/linux/elf.h
+--- linux-2.6.32.46/include/linux/elf.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/elf.h	2011-04-17 15:56:46.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -57577,9 +60334,9 @@ diff -urNp linux-2.6.32.45/include/linux/elf.h linux-2.6.32.45/include/linux/elf
  
  #endif
  
-diff -urNp linux-2.6.32.45/include/linux/fscache-cache.h linux-2.6.32.45/include/linux/fscache-cache.h
---- linux-2.6.32.45/include/linux/fscache-cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/fscache-cache.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/fscache-cache.h linux-2.6.32.46/include/linux/fscache-cache.h
+--- linux-2.6.32.46/include/linux/fscache-cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/fscache-cache.h	2011-05-04 17:56:28.000000000 -0400
 @@ -116,7 +116,7 @@ struct fscache_operation {
  #endif
  };
@@ -57598,9 +60355,9 @@ diff -urNp linux-2.6.32.45/include/linux/fscache-cache.h linux-2.6.32.45/include
  	op->release = release;
  	INIT_LIST_HEAD(&op->pend_link);
  	fscache_set_op_state(op, "Init");
-diff -urNp linux-2.6.32.45/include/linux/fs.h linux-2.6.32.45/include/linux/fs.h
---- linux-2.6.32.45/include/linux/fs.h	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/include/linux/fs.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/fs.h linux-2.6.32.46/include/linux/fs.h
+--- linux-2.6.32.46/include/linux/fs.h	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/include/linux/fs.h	2011-08-26 20:19:09.000000000 -0400
 @@ -90,6 +90,11 @@ struct inodes_stat_t {
  /* Expect random access pattern */
  #define FMODE_RANDOM		((__force fmode_t)4096)
@@ -57772,9 +60529,9 @@ diff -urNp linux-2.6.32.45/include/linux/fs.h linux-2.6.32.45/include/linux/fs.h
  };
  
  /*
-diff -urNp linux-2.6.32.45/include/linux/fs_struct.h linux-2.6.32.45/include/linux/fs_struct.h
---- linux-2.6.32.45/include/linux/fs_struct.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/fs_struct.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/fs_struct.h linux-2.6.32.46/include/linux/fs_struct.h
+--- linux-2.6.32.46/include/linux/fs_struct.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/fs_struct.h	2011-04-17 15:56:46.000000000 -0400
 @@ -4,7 +4,7 @@
  #include <linux/path.h>
  
@@ -57784,9 +60541,9 @@ diff -urNp linux-2.6.32.45/include/linux/fs_struct.h linux-2.6.32.45/include/lin
  	rwlock_t lock;
  	int umask;
  	int in_exec;
-diff -urNp linux-2.6.32.45/include/linux/ftrace_event.h linux-2.6.32.45/include/linux/ftrace_event.h
---- linux-2.6.32.45/include/linux/ftrace_event.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/ftrace_event.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/ftrace_event.h linux-2.6.32.46/include/linux/ftrace_event.h
+--- linux-2.6.32.46/include/linux/ftrace_event.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/ftrace_event.h	2011-05-04 17:56:28.000000000 -0400
 @@ -163,7 +163,7 @@ extern int trace_define_field(struct ftr
  			      int filter_type);
  extern int trace_define_common_fields(struct ftrace_event_call *call);
@@ -57796,9 +60553,9 @@ diff -urNp linux-2.6.32.45/include/linux/ftrace_event.h linux-2.6.32.45/include/
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-2.6.32.45/include/linux/genhd.h linux-2.6.32.45/include/linux/genhd.h
---- linux-2.6.32.45/include/linux/genhd.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/genhd.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/genhd.h linux-2.6.32.46/include/linux/genhd.h
+--- linux-2.6.32.46/include/linux/genhd.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/genhd.h	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ struct gendisk {
  
  	struct timer_rand_state *random;
@@ -57808,9 +60565,9 @@ diff -urNp linux-2.6.32.45/include/linux/genhd.h linux-2.6.32.45/include/linux/g
  	struct work_struct async_notify;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-2.6.32.45/include/linux/gracl.h linux-2.6.32.45/include/linux/gracl.h
---- linux-2.6.32.45/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/gracl.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/gracl.h linux-2.6.32.46/include/linux/gracl.h
+--- linux-2.6.32.46/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/gracl.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -58129,9 +60886,9 @@ diff -urNp linux-2.6.32.45/include/linux/gracl.h linux-2.6.32.45/include/linux/g
 +
 +#endif
 +
-diff -urNp linux-2.6.32.45/include/linux/gralloc.h linux-2.6.32.45/include/linux/gralloc.h
---- linux-2.6.32.45/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/gralloc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/gralloc.h linux-2.6.32.46/include/linux/gralloc.h
+--- linux-2.6.32.46/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/gralloc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -58142,9 +60899,9 @@ diff -urNp linux-2.6.32.45/include/linux/gralloc.h linux-2.6.32.45/include/linux
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-2.6.32.45/include/linux/grdefs.h linux-2.6.32.45/include/linux/grdefs.h
---- linux-2.6.32.45/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/grdefs.h	2011-06-11 16:20:26.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/grdefs.h linux-2.6.32.46/include/linux/grdefs.h
+--- linux-2.6.32.46/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/grdefs.h	2011-06-11 16:20:26.000000000 -0400
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -58286,9 +61043,9 @@ diff -urNp linux-2.6.32.45/include/linux/grdefs.h linux-2.6.32.45/include/linux/
 +};
 +
 +#endif
-diff -urNp linux-2.6.32.45/include/linux/grinternal.h linux-2.6.32.45/include/linux/grinternal.h
---- linux-2.6.32.45/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/grinternal.h	2011-08-11 19:58:37.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/grinternal.h linux-2.6.32.46/include/linux/grinternal.h
+--- linux-2.6.32.46/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/grinternal.h	2011-08-11 19:58:37.000000000 -0400
 @@ -0,0 +1,217 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -58507,9 +61264,9 @@ diff -urNp linux-2.6.32.45/include/linux/grinternal.h linux-2.6.32.45/include/li
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.32.45/include/linux/grmsg.h linux-2.6.32.45/include/linux/grmsg.h
---- linux-2.6.32.45/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/grmsg.h	2011-08-25 17:28:11.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/grmsg.h linux-2.6.32.46/include/linux/grmsg.h
+--- linux-2.6.32.46/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/grmsg.h	2011-08-25 17:28:11.000000000 -0400
 @@ -0,0 +1,107 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -58618,9 +61375,9 @@ diff -urNp linux-2.6.32.45/include/linux/grmsg.h linux-2.6.32.45/include/linux/g
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-2.6.32.45/include/linux/grsecurity.h linux-2.6.32.45/include/linux/grsecurity.h
---- linux-2.6.32.45/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/grsecurity.h	2011-08-11 19:58:57.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/grsecurity.h linux-2.6.32.46/include/linux/grsecurity.h
+--- linux-2.6.32.46/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/grsecurity.h	2011-08-11 19:58:57.000000000 -0400
 @@ -0,0 +1,217 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
@@ -58839,9 +61596,9 @@ diff -urNp linux-2.6.32.45/include/linux/grsecurity.h linux-2.6.32.45/include/li
 +#endif
 +
 +#endif
-diff -urNp linux-2.6.32.45/include/linux/hdpu_features.h linux-2.6.32.45/include/linux/hdpu_features.h
---- linux-2.6.32.45/include/linux/hdpu_features.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/hdpu_features.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/hdpu_features.h linux-2.6.32.46/include/linux/hdpu_features.h
+--- linux-2.6.32.46/include/linux/hdpu_features.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/hdpu_features.h	2011-04-17 15:56:46.000000000 -0400
 @@ -3,7 +3,7 @@
  struct cpustate_t {
  	spinlock_t lock;
@@ -58851,9 +61608,9 @@ diff -urNp linux-2.6.32.45/include/linux/hdpu_features.h linux-2.6.32.45/include
  	unsigned char cached_val;
  	int inited;
  	unsigned long *set_addr;
-diff -urNp linux-2.6.32.45/include/linux/highmem.h linux-2.6.32.45/include/linux/highmem.h
---- linux-2.6.32.45/include/linux/highmem.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/highmem.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/highmem.h linux-2.6.32.46/include/linux/highmem.h
+--- linux-2.6.32.46/include/linux/highmem.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/highmem.h	2011-04-17 15:56:46.000000000 -0400
 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
@@ -58873,9 +61630,9 @@ diff -urNp linux-2.6.32.45/include/linux/highmem.h linux-2.6.32.45/include/linux
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-2.6.32.45/include/linux/i2c.h linux-2.6.32.45/include/linux/i2c.h
---- linux-2.6.32.45/include/linux/i2c.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/i2c.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/i2c.h linux-2.6.32.46/include/linux/i2c.h
+--- linux-2.6.32.46/include/linux/i2c.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/i2c.h	2011-08-23 21:22:38.000000000 -0400
 @@ -325,6 +325,7 @@ struct i2c_algorithm {
  	/* To determine what the adapter supports */
  	u32 (*functionality) (struct i2c_adapter *);
@@ -58884,9 +61641,9 @@ diff -urNp linux-2.6.32.45/include/linux/i2c.h linux-2.6.32.45/include/linux/i2c
  
  /*
   * i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-2.6.32.45/include/linux/i2o.h linux-2.6.32.45/include/linux/i2o.h
---- linux-2.6.32.45/include/linux/i2o.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/i2o.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/i2o.h linux-2.6.32.46/include/linux/i2o.h
+--- linux-2.6.32.46/include/linux/i2o.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/i2o.h	2011-05-04 17:56:28.000000000 -0400
 @@ -564,7 +564,7 @@ struct i2o_controller {
  	struct i2o_device *exec;	/* Executive */
  #if BITS_PER_LONG == 64
@@ -58896,9 +61653,9 @@ diff -urNp linux-2.6.32.45/include/linux/i2o.h linux-2.6.32.45/include/linux/i2o
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff -urNp linux-2.6.32.45/include/linux/init_task.h linux-2.6.32.45/include/linux/init_task.h
---- linux-2.6.32.45/include/linux/init_task.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/init_task.h	2011-05-18 20:44:59.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/init_task.h linux-2.6.32.46/include/linux/init_task.h
+--- linux-2.6.32.46/include/linux/init_task.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/init_task.h	2011-05-18 20:44:59.000000000 -0400
 @@ -83,6 +83,12 @@ extern struct group_info init_groups;
  #define INIT_IDS
  #endif
@@ -58920,9 +61677,9 @@ diff -urNp linux-2.6.32.45/include/linux/init_task.h linux-2.6.32.45/include/lin
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-2.6.32.45/include/linux/intel-iommu.h linux-2.6.32.45/include/linux/intel-iommu.h
---- linux-2.6.32.45/include/linux/intel-iommu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/intel-iommu.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/intel-iommu.h linux-2.6.32.46/include/linux/intel-iommu.h
+--- linux-2.6.32.46/include/linux/intel-iommu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/intel-iommu.h	2011-08-05 20:33:55.000000000 -0400
 @@ -296,7 +296,7 @@ struct iommu_flush {
  			      u8 fm, u64 type);
  	void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -58932,9 +61689,9 @@ diff -urNp linux-2.6.32.45/include/linux/intel-iommu.h linux-2.6.32.45/include/l
  
  enum {
  	SR_DMAR_FECTL_REG,
-diff -urNp linux-2.6.32.45/include/linux/interrupt.h linux-2.6.32.45/include/linux/interrupt.h
---- linux-2.6.32.45/include/linux/interrupt.h	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/include/linux/interrupt.h	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/interrupt.h linux-2.6.32.46/include/linux/interrupt.h
+--- linux-2.6.32.46/include/linux/interrupt.h	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/include/linux/interrupt.h	2011-06-25 12:56:37.000000000 -0400
 @@ -363,7 +363,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -58959,9 +61716,9 @@ diff -urNp linux-2.6.32.45/include/linux/interrupt.h linux-2.6.32.45/include/lin
  extern void softirq_init(void);
  #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
  extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.32.45/include/linux/irq.h linux-2.6.32.45/include/linux/irq.h
---- linux-2.6.32.45/include/linux/irq.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/irq.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/irq.h linux-2.6.32.46/include/linux/irq.h
+--- linux-2.6.32.46/include/linux/irq.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/irq.h	2011-04-17 15:56:46.000000000 -0400
 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq,
  static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
  							bool boot)
@@ -58976,9 +61733,9 @@ diff -urNp linux-2.6.32.45/include/linux/irq.h linux-2.6.32.45/include/linux/irq
  	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
  		return false;
  
-diff -urNp linux-2.6.32.45/include/linux/kallsyms.h linux-2.6.32.45/include/linux/kallsyms.h
---- linux-2.6.32.45/include/linux/kallsyms.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/kallsyms.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/kallsyms.h linux-2.6.32.46/include/linux/kallsyms.h
+--- linux-2.6.32.46/include/linux/kallsyms.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/kallsyms.h	2011-04-17 15:56:46.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -59005,9 +61762,9 @@ diff -urNp linux-2.6.32.45/include/linux/kallsyms.h linux-2.6.32.45/include/linu
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.32.45/include/linux/kgdb.h linux-2.6.32.45/include/linux/kgdb.h
---- linux-2.6.32.45/include/linux/kgdb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/kgdb.h	2011-08-26 20:25:20.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/kgdb.h linux-2.6.32.46/include/linux/kgdb.h
+--- linux-2.6.32.46/include/linux/kgdb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/kgdb.h	2011-08-26 20:25:20.000000000 -0400
 @@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
  
  extern int kgdb_connected;
@@ -59047,9 +61804,9 @@ diff -urNp linux-2.6.32.45/include/linux/kgdb.h linux-2.6.32.45/include/linux/kg
  
  extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
  extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.32.45/include/linux/kmod.h linux-2.6.32.45/include/linux/kmod.h
---- linux-2.6.32.45/include/linux/kmod.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/kmod.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/kmod.h linux-2.6.32.46/include/linux/kmod.h
+--- linux-2.6.32.46/include/linux/kmod.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/kmod.h	2011-04-17 15:56:46.000000000 -0400
 @@ -31,6 +31,8 @@
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -59059,9 +61816,9 @@ diff -urNp linux-2.6.32.45/include/linux/kmod.h linux-2.6.32.45/include/linux/km
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff -urNp linux-2.6.32.45/include/linux/kobject.h linux-2.6.32.45/include/linux/kobject.h
---- linux-2.6.32.45/include/linux/kobject.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/kobject.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/kobject.h linux-2.6.32.46/include/linux/kobject.h
+--- linux-2.6.32.46/include/linux/kobject.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/kobject.h	2011-04-17 15:56:46.000000000 -0400
 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
  
  struct kobj_type {
@@ -59110,9 +61867,9 @@ diff -urNp linux-2.6.32.45/include/linux/kobject.h linux-2.6.32.45/include/linux
  						struct kobject *parent_kobj);
  
  static inline struct kset *to_kset(struct kobject *kobj)
-diff -urNp linux-2.6.32.45/include/linux/kvm_host.h linux-2.6.32.45/include/linux/kvm_host.h
---- linux-2.6.32.45/include/linux/kvm_host.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/kvm_host.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/kvm_host.h linux-2.6.32.46/include/linux/kvm_host.h
+--- linux-2.6.32.46/include/linux/kvm_host.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/kvm_host.h	2011-04-17 15:56:46.000000000 -0400
 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
@@ -59131,9 +61888,9 @@ diff -urNp linux-2.6.32.45/include/linux/kvm_host.h linux-2.6.32.45/include/linu
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.32.45/include/linux/libata.h linux-2.6.32.45/include/linux/libata.h
---- linux-2.6.32.45/include/linux/libata.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/libata.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/libata.h linux-2.6.32.46/include/linux/libata.h
+--- linux-2.6.32.46/include/linux/libata.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/libata.h	2011-08-26 20:19:09.000000000 -0400
 @@ -525,11 +525,11 @@ struct ata_ioports {
  
  struct ata_host {
@@ -59193,9 +61950,9 @@ diff -urNp linux-2.6.32.45/include/linux/libata.h linux-2.6.32.45/include/linux/
  extern int ata_scsi_detect(struct scsi_host_template *sht);
  extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
  extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.32.45/include/linux/lockd/bind.h linux-2.6.32.45/include/linux/lockd/bind.h
---- linux-2.6.32.45/include/linux/lockd/bind.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/lockd/bind.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/lockd/bind.h linux-2.6.32.46/include/linux/lockd/bind.h
+--- linux-2.6.32.46/include/linux/lockd/bind.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/lockd/bind.h	2011-04-17 15:56:46.000000000 -0400
 @@ -23,13 +23,13 @@ struct svc_rqst;
   * This is the set of functions for lockd->nfsd communication
   */
@@ -59213,9 +61970,9 @@ diff -urNp linux-2.6.32.45/include/linux/lockd/bind.h linux-2.6.32.45/include/li
  
  /*
   * Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.32.45/include/linux/mca.h linux-2.6.32.45/include/linux/mca.h
---- linux-2.6.32.45/include/linux/mca.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mca.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mca.h linux-2.6.32.46/include/linux/mca.h
+--- linux-2.6.32.46/include/linux/mca.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mca.h	2011-08-05 20:33:55.000000000 -0400
 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
  						  int region);
  	void *		(*mca_transform_memory)(struct mca_device *,
@@ -59225,9 +61982,9 @@ diff -urNp linux-2.6.32.45/include/linux/mca.h linux-2.6.32.45/include/linux/mca
  
  struct mca_bus {
  	u64			default_dma_mask;
-diff -urNp linux-2.6.32.45/include/linux/memory.h linux-2.6.32.45/include/linux/memory.h
---- linux-2.6.32.45/include/linux/memory.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/memory.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/memory.h linux-2.6.32.46/include/linux/memory.h
+--- linux-2.6.32.46/include/linux/memory.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/memory.h	2011-08-05 20:33:55.000000000 -0400
 @@ -108,7 +108,7 @@ struct memory_accessor {
  			size_t count);
  	ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -59237,9 +61994,9 @@ diff -urNp linux-2.6.32.45/include/linux/memory.h linux-2.6.32.45/include/linux/
  
  /*
   * Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-2.6.32.45/include/linux/mm.h linux-2.6.32.45/include/linux/mm.h
---- linux-2.6.32.45/include/linux/mm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mm.h linux-2.6.32.46/include/linux/mm.h
+--- linux-2.6.32.46/include/linux/mm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
@@ -59319,9 +62076,9 @@ diff -urNp linux-2.6.32.45/include/linux/mm.h linux-2.6.32.45/include/linux/mm.h
  
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.32.45/include/linux/mm_types.h linux-2.6.32.45/include/linux/mm_types.h
---- linux-2.6.32.45/include/linux/mm_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mm_types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mm_types.h linux-2.6.32.46/include/linux/mm_types.h
+--- linux-2.6.32.46/include/linux/mm_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mm_types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -186,6 +186,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
@@ -59356,9 +62113,9 @@ diff -urNp linux-2.6.32.45/include/linux/mm_types.h linux-2.6.32.45/include/linu
  };
  
  /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.32.45/include/linux/mmu_notifier.h linux-2.6.32.45/include/linux/mmu_notifier.h
---- linux-2.6.32.45/include/linux/mmu_notifier.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mmu_notifier.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mmu_notifier.h linux-2.6.32.46/include/linux/mmu_notifier.h
+--- linux-2.6.32.46/include/linux/mmu_notifier.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mmu_notifier.h	2011-04-17 15:56:46.000000000 -0400
 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
@@ -59375,9 +62132,9 @@ diff -urNp linux-2.6.32.45/include/linux/mmu_notifier.h linux-2.6.32.45/include/
  })
  
  #define ptep_clear_flush_young_notify(__vma, __address, __ptep)		\
-diff -urNp linux-2.6.32.45/include/linux/mmzone.h linux-2.6.32.45/include/linux/mmzone.h
---- linux-2.6.32.45/include/linux/mmzone.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mmzone.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mmzone.h linux-2.6.32.46/include/linux/mmzone.h
+--- linux-2.6.32.46/include/linux/mmzone.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mmzone.h	2011-04-17 15:56:46.000000000 -0400
 @@ -350,7 +350,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
@@ -59387,9 +62144,9 @@ diff -urNp linux-2.6.32.45/include/linux/mmzone.h linux-2.6.32.45/include/linux/
  
  	/*
  	 * prev_priority holds the scanning priority for this zone.  It is
-diff -urNp linux-2.6.32.45/include/linux/mod_devicetable.h linux-2.6.32.45/include/linux/mod_devicetable.h
---- linux-2.6.32.45/include/linux/mod_devicetable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mod_devicetable.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mod_devicetable.h linux-2.6.32.46/include/linux/mod_devicetable.h
+--- linux-2.6.32.46/include/linux/mod_devicetable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mod_devicetable.h	2011-04-17 15:56:46.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -59408,9 +62165,9 @@ diff -urNp linux-2.6.32.45/include/linux/mod_devicetable.h linux-2.6.32.45/inclu
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-2.6.32.45/include/linux/module.h linux-2.6.32.45/include/linux/module.h
---- linux-2.6.32.45/include/linux/module.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/module.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/module.h linux-2.6.32.46/include/linux/module.h
+--- linux-2.6.32.46/include/linux/module.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/module.h	2011-08-05 20:33:55.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/kobject.h>
  #include <linux/moduleparam.h>
@@ -59502,9 +62259,9 @@ diff -urNp linux-2.6.32.45/include/linux/module.h linux-2.6.32.45/include/linux/
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.32.45/include/linux/moduleloader.h linux-2.6.32.45/include/linux/moduleloader.h
---- linux-2.6.32.45/include/linux/moduleloader.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/moduleloader.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/moduleloader.h linux-2.6.32.46/include/linux/moduleloader.h
+--- linux-2.6.32.46/include/linux/moduleloader.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/moduleloader.h	2011-04-17 15:56:46.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -59527,9 +62284,9 @@ diff -urNp linux-2.6.32.45/include/linux/moduleloader.h linux-2.6.32.45/include/
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.32.45/include/linux/moduleparam.h linux-2.6.32.45/include/linux/moduleparam.h
---- linux-2.6.32.45/include/linux/moduleparam.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/moduleparam.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/moduleparam.h linux-2.6.32.46/include/linux/moduleparam.h
+--- linux-2.6.32.46/include/linux/moduleparam.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/moduleparam.h	2011-04-17 15:56:46.000000000 -0400
 @@ -132,7 +132,7 @@ struct kparam_array
  
  /* Actually copy string: maxlen param is usually sizeof(string). */
@@ -59548,9 +62305,9 @@ diff -urNp linux-2.6.32.45/include/linux/moduleparam.h linux-2.6.32.45/include/l
  	= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
  	    sizeof(array[0]), array };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
-diff -urNp linux-2.6.32.45/include/linux/mutex.h linux-2.6.32.45/include/linux/mutex.h
---- linux-2.6.32.45/include/linux/mutex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/mutex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/mutex.h linux-2.6.32.46/include/linux/mutex.h
+--- linux-2.6.32.46/include/linux/mutex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/mutex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -51,7 +51,7 @@ struct mutex {
  	spinlock_t		wait_lock;
  	struct list_head	wait_list;
@@ -59560,9 +62317,9 @@ diff -urNp linux-2.6.32.45/include/linux/mutex.h linux-2.6.32.45/include/linux/m
  #endif
  #ifdef CONFIG_DEBUG_MUTEXES
  	const char 		*name;
-diff -urNp linux-2.6.32.45/include/linux/namei.h linux-2.6.32.45/include/linux/namei.h
---- linux-2.6.32.45/include/linux/namei.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/namei.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/namei.h linux-2.6.32.46/include/linux/namei.h
+--- linux-2.6.32.46/include/linux/namei.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/namei.h	2011-04-17 15:56:46.000000000 -0400
 @@ -22,7 +22,7 @@ struct nameidata {
  	unsigned int	flags;
  	int		last_type;
@@ -59587,9 +62344,9 @@ diff -urNp linux-2.6.32.45/include/linux/namei.h linux-2.6.32.45/include/linux/n
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-2.6.32.45/include/linux/netdevice.h linux-2.6.32.45/include/linux/netdevice.h
---- linux-2.6.32.45/include/linux/netdevice.h	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/include/linux/netdevice.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/netdevice.h linux-2.6.32.46/include/linux/netdevice.h
+--- linux-2.6.32.46/include/linux/netdevice.h	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/include/linux/netdevice.h	2011-08-23 21:22:38.000000000 -0400
 @@ -637,6 +637,7 @@ struct net_device_ops {
  						     u16 xid);
  #endif
@@ -59598,9 +62355,9 @@ diff -urNp linux-2.6.32.45/include/linux/netdevice.h linux-2.6.32.45/include/lin
  
  /*
   *	The DEVICE structure.
-diff -urNp linux-2.6.32.45/include/linux/netfilter/xt_gradm.h linux-2.6.32.45/include/linux/netfilter/xt_gradm.h
---- linux-2.6.32.45/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/include/linux/netfilter/xt_gradm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/netfilter/xt_gradm.h linux-2.6.32.46/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.32.46/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/include/linux/netfilter/xt_gradm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -59611,9 +62368,9 @@ diff -urNp linux-2.6.32.45/include/linux/netfilter/xt_gradm.h linux-2.6.32.45/in
 +};
 +
 +#endif
-diff -urNp linux-2.6.32.45/include/linux/nodemask.h linux-2.6.32.45/include/linux/nodemask.h
---- linux-2.6.32.45/include/linux/nodemask.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/nodemask.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/nodemask.h linux-2.6.32.46/include/linux/nodemask.h
+--- linux-2.6.32.46/include/linux/nodemask.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/nodemask.h	2011-04-17 15:56:46.000000000 -0400
 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no
  
  #define any_online_node(mask)			\
@@ -59630,9 +62387,9 @@ diff -urNp linux-2.6.32.45/include/linux/nodemask.h linux-2.6.32.45/include/linu
  })
  
  #define num_online_nodes()	num_node_state(N_ONLINE)
-diff -urNp linux-2.6.32.45/include/linux/oprofile.h linux-2.6.32.45/include/linux/oprofile.h
---- linux-2.6.32.45/include/linux/oprofile.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/oprofile.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/oprofile.h linux-2.6.32.46/include/linux/oprofile.h
+--- linux-2.6.32.46/include/linux/oprofile.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/oprofile.h	2011-04-17 15:56:46.000000000 -0400
 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
  	char const * name, ulong * val);
@@ -59645,9 +62402,9 @@ diff -urNp linux-2.6.32.45/include/linux/oprofile.h linux-2.6.32.45/include/linu
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.32.45/include/linux/pagemap.h linux-2.6.32.45/include/linux/pagemap.h
---- linux-2.6.32.45/include/linux/pagemap.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/pagemap.h	2011-08-17 19:36:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/pagemap.h linux-2.6.32.46/include/linux/pagemap.h
+--- linux-2.6.32.46/include/linux/pagemap.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/pagemap.h	2011-08-17 19:36:28.000000000 -0400
 @@ -425,6 +425,7 @@ static inline int fault_in_pages_readabl
  		if (((unsigned long)uaddr & PAGE_MASK) !=
  				((unsigned long)end & PAGE_MASK))
@@ -59656,9 +62413,9 @@ diff -urNp linux-2.6.32.45/include/linux/pagemap.h linux-2.6.32.45/include/linux
  	}
  	return ret;
  }
-diff -urNp linux-2.6.32.45/include/linux/perf_event.h linux-2.6.32.45/include/linux/perf_event.h
---- linux-2.6.32.45/include/linux/perf_event.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/perf_event.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/perf_event.h linux-2.6.32.46/include/linux/perf_event.h
+--- linux-2.6.32.46/include/linux/perf_event.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/perf_event.h	2011-05-04 17:56:28.000000000 -0400
 @@ -476,7 +476,7 @@ struct hw_perf_event {
  			struct hrtimer	hrtimer;
  		};
@@ -59688,9 +62445,9 @@ diff -urNp linux-2.6.32.45/include/linux/perf_event.h linux-2.6.32.45/include/li
  
  	/*
  	 * Protect attach/detach and child_list:
-diff -urNp linux-2.6.32.45/include/linux/pipe_fs_i.h linux-2.6.32.45/include/linux/pipe_fs_i.h
---- linux-2.6.32.45/include/linux/pipe_fs_i.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/pipe_fs_i.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/pipe_fs_i.h linux-2.6.32.46/include/linux/pipe_fs_i.h
+--- linux-2.6.32.46/include/linux/pipe_fs_i.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/pipe_fs_i.h	2011-04-17 15:56:46.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_inode_info {
  	wait_queue_head_t wait;
  	unsigned int nrbufs, curbuf;
@@ -59704,9 +62461,9 @@ diff -urNp linux-2.6.32.45/include/linux/pipe_fs_i.h linux-2.6.32.45/include/lin
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct fasync_struct *fasync_readers;
-diff -urNp linux-2.6.32.45/include/linux/poison.h linux-2.6.32.45/include/linux/poison.h
---- linux-2.6.32.45/include/linux/poison.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/poison.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/poison.h linux-2.6.32.46/include/linux/poison.h
+--- linux-2.6.32.46/include/linux/poison.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/poison.h	2011-04-17 15:56:46.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -59718,9 +62475,9 @@ diff -urNp linux-2.6.32.45/include/linux/poison.h linux-2.6.32.45/include/linux/
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-2.6.32.45/include/linux/posix-timers.h linux-2.6.32.45/include/linux/posix-timers.h
---- linux-2.6.32.45/include/linux/posix-timers.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/posix-timers.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/posix-timers.h linux-2.6.32.46/include/linux/posix-timers.h
+--- linux-2.6.32.46/include/linux/posix-timers.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/posix-timers.h	2011-08-05 20:33:55.000000000 -0400
 @@ -67,7 +67,7 @@ struct k_itimer {
  };
  
@@ -59730,9 +62487,9 @@ diff -urNp linux-2.6.32.45/include/linux/posix-timers.h linux-2.6.32.45/include/
  	int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
  	int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
  	int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
-diff -urNp linux-2.6.32.45/include/linux/preempt.h linux-2.6.32.45/include/linux/preempt.h
---- linux-2.6.32.45/include/linux/preempt.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/preempt.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/preempt.h linux-2.6.32.46/include/linux/preempt.h
+--- linux-2.6.32.46/include/linux/preempt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/preempt.h	2011-08-05 20:33:55.000000000 -0400
 @@ -110,7 +110,7 @@ struct preempt_ops {
  	void (*sched_in)(struct preempt_notifier *notifier, int cpu);
  	void (*sched_out)(struct preempt_notifier *notifier,
@@ -59742,9 +62499,9 @@ diff -urNp linux-2.6.32.45/include/linux/preempt.h linux-2.6.32.45/include/linux
  
  /**
   * preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-2.6.32.45/include/linux/proc_fs.h linux-2.6.32.45/include/linux/proc_fs.h
---- linux-2.6.32.45/include/linux/proc_fs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/proc_fs.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/proc_fs.h linux-2.6.32.46/include/linux/proc_fs.h
+--- linux-2.6.32.46/include/linux/proc_fs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/proc_fs.h	2011-08-05 20:33:55.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -59774,9 +62531,9 @@ diff -urNp linux-2.6.32.45/include/linux/proc_fs.h linux-2.6.32.45/include/linux
  
  struct ctl_table_header;
  struct ctl_table;
-diff -urNp linux-2.6.32.45/include/linux/ptrace.h linux-2.6.32.45/include/linux/ptrace.h
---- linux-2.6.32.45/include/linux/ptrace.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/ptrace.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/ptrace.h linux-2.6.32.46/include/linux/ptrace.h
+--- linux-2.6.32.46/include/linux/ptrace.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/ptrace.h	2011-04-17 15:56:46.000000000 -0400
 @@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
@@ -59790,9 +62547,9 @@ diff -urNp linux-2.6.32.45/include/linux/ptrace.h linux-2.6.32.45/include/linux/
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-2.6.32.45/include/linux/random.h linux-2.6.32.45/include/linux/random.h
---- linux-2.6.32.45/include/linux/random.h	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/include/linux/random.h	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/random.h linux-2.6.32.46/include/linux/random.h
+--- linux-2.6.32.46/include/linux/random.h	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/include/linux/random.h	2011-08-07 19:48:09.000000000 -0400
 @@ -63,6 +63,11 @@ unsigned long randomize_range(unsigned l
  u32 random32(void);
  void srandom32(u32 seed);
@@ -59805,9 +62562,9 @@ diff -urNp linux-2.6.32.45/include/linux/random.h linux-2.6.32.45/include/linux/
  #endif /* __KERNEL___ */
  
  #endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.32.45/include/linux/reboot.h linux-2.6.32.45/include/linux/reboot.h
---- linux-2.6.32.45/include/linux/reboot.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/reboot.h	2011-05-22 23:02:06.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/reboot.h linux-2.6.32.46/include/linux/reboot.h
+--- linux-2.6.32.46/include/linux/reboot.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/reboot.h	2011-05-22 23:02:06.000000000 -0400
 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
@@ -59843,9 +62600,9 @@ diff -urNp linux-2.6.32.45/include/linux/reboot.h linux-2.6.32.45/include/linux/
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-2.6.32.45/include/linux/reiserfs_fs.h linux-2.6.32.45/include/linux/reiserfs_fs.h
---- linux-2.6.32.45/include/linux/reiserfs_fs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/reiserfs_fs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs.h linux-2.6.32.46/include/linux/reiserfs_fs.h
+--- linux-2.6.32.46/include/linux/reiserfs_fs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/reiserfs_fs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
@@ -59892,9 +62649,9 @@ diff -urNp linux-2.6.32.45/include/linux/reiserfs_fs.h linux-2.6.32.45/include/l
  
  #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
  #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff -urNp linux-2.6.32.45/include/linux/reiserfs_fs_sb.h linux-2.6.32.45/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.45/include/linux/reiserfs_fs_sb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/reiserfs_fs_sb.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/reiserfs_fs_sb.h linux-2.6.32.46/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.32.46/include/linux/reiserfs_fs_sb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/reiserfs_fs_sb.h	2011-04-17 15:56:46.000000000 -0400
 @@ -377,7 +377,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -59904,9 +62661,9 @@ diff -urNp linux-2.6.32.45/include/linux/reiserfs_fs_sb.h linux-2.6.32.45/includ
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-2.6.32.45/include/linux/relay.h linux-2.6.32.45/include/linux/relay.h
---- linux-2.6.32.45/include/linux/relay.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/relay.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/relay.h linux-2.6.32.46/include/linux/relay.h
+--- linux-2.6.32.46/include/linux/relay.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/relay.h	2011-08-05 20:33:55.000000000 -0400
 @@ -159,7 +159,7 @@ struct rchan_callbacks
  	 * The callback should return 0 if successful, negative if not.
  	 */
@@ -59916,9 +62673,9 @@ diff -urNp linux-2.6.32.45/include/linux/relay.h linux-2.6.32.45/include/linux/r
  
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-2.6.32.45/include/linux/rfkill.h linux-2.6.32.45/include/linux/rfkill.h
---- linux-2.6.32.45/include/linux/rfkill.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/rfkill.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/rfkill.h linux-2.6.32.46/include/linux/rfkill.h
+--- linux-2.6.32.46/include/linux/rfkill.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/rfkill.h	2011-08-23 21:22:38.000000000 -0400
 @@ -144,6 +144,7 @@ struct rfkill_ops {
  	void	(*query)(struct rfkill *rfkill, void *data);
  	int	(*set_block)(void *data, bool blocked);
@@ -59927,9 +62684,9 @@ diff -urNp linux-2.6.32.45/include/linux/rfkill.h linux-2.6.32.45/include/linux/
  
  #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  /**
-diff -urNp linux-2.6.32.45/include/linux/sched.h linux-2.6.32.45/include/linux/sched.h
---- linux-2.6.32.45/include/linux/sched.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sched.h	2011-08-11 19:48:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sched.h linux-2.6.32.46/include/linux/sched.h
+--- linux-2.6.32.46/include/linux/sched.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sched.h	2011-08-11 19:48:55.000000000 -0400
 @@ -101,6 +101,7 @@ struct bio;
  struct fs_struct;
  struct bts_context;
@@ -60190,9 +62947,9 @@ diff -urNp linux-2.6.32.45/include/linux/sched.h linux-2.6.32.45/include/linux/s
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-2.6.32.45/include/linux/screen_info.h linux-2.6.32.45/include/linux/screen_info.h
---- linux-2.6.32.45/include/linux/screen_info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/screen_info.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/screen_info.h linux-2.6.32.46/include/linux/screen_info.h
+--- linux-2.6.32.46/include/linux/screen_info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/screen_info.h	2011-04-17 15:56:46.000000000 -0400
 @@ -42,7 +42,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -60203,9 +62960,9 @@ diff -urNp linux-2.6.32.45/include/linux/screen_info.h linux-2.6.32.45/include/l
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-2.6.32.45/include/linux/security.h linux-2.6.32.45/include/linux/security.h
---- linux-2.6.32.45/include/linux/security.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/security.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/security.h linux-2.6.32.46/include/linux/security.h
+--- linux-2.6.32.46/include/linux/security.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/security.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,6 +34,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -60214,9 +62971,9 @@ diff -urNp linux-2.6.32.45/include/linux/security.h linux-2.6.32.45/include/linu
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.32.45/include/linux/seq_file.h linux-2.6.32.45/include/linux/seq_file.h
---- linux-2.6.32.45/include/linux/seq_file.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/seq_file.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/seq_file.h linux-2.6.32.46/include/linux/seq_file.h
+--- linux-2.6.32.46/include/linux/seq_file.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/seq_file.h	2011-08-23 21:22:38.000000000 -0400
 @@ -32,6 +32,7 @@ struct seq_operations {
  	void * (*next) (struct seq_file *m, void *v, loff_t *pos);
  	int (*show) (struct seq_file *m, void *v);
@@ -60225,9 +62982,9 @@ diff -urNp linux-2.6.32.45/include/linux/seq_file.h linux-2.6.32.45/include/linu
  
  #define SEQ_SKIP 1
  
-diff -urNp linux-2.6.32.45/include/linux/shm.h linux-2.6.32.45/include/linux/shm.h
---- linux-2.6.32.45/include/linux/shm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/shm.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/shm.h linux-2.6.32.46/include/linux/shm.h
+--- linux-2.6.32.46/include/linux/shm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/shm.h	2011-04-17 15:56:46.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
@@ -60239,9 +62996,9 @@ diff -urNp linux-2.6.32.45/include/linux/shm.h linux-2.6.32.45/include/linux/shm
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-2.6.32.45/include/linux/skbuff.h linux-2.6.32.45/include/linux/skbuff.h
---- linux-2.6.32.45/include/linux/skbuff.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/skbuff.h	2011-08-21 15:27:56.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/skbuff.h linux-2.6.32.46/include/linux/skbuff.h
+--- linux-2.6.32.46/include/linux/skbuff.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/skbuff.h	2011-08-21 15:27:56.000000000 -0400
 @@ -14,6 +14,7 @@
  #ifndef _LINUX_SKBUFF_H
  #define _LINUX_SKBUFF_H
@@ -60286,9 +63043,9 @@ diff -urNp linux-2.6.32.45/include/linux/skbuff.h linux-2.6.32.45/include/linux/
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-2.6.32.45/include/linux/slab_def.h linux-2.6.32.45/include/linux/slab_def.h
---- linux-2.6.32.45/include/linux/slab_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/slab_def.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/slab_def.h linux-2.6.32.46/include/linux/slab_def.h
+--- linux-2.6.32.46/include/linux/slab_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/slab_def.h	2011-05-04 17:56:28.000000000 -0400
 @@ -69,10 +69,10 @@ struct kmem_cache {
  	unsigned long node_allocs;
  	unsigned long node_frees;
@@ -60304,9 +63061,9 @@ diff -urNp linux-2.6.32.45/include/linux/slab_def.h linux-2.6.32.45/include/linu
  
  	/*
  	 * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-2.6.32.45/include/linux/slab.h linux-2.6.32.45/include/linux/slab.h
---- linux-2.6.32.45/include/linux/slab.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/slab.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/slab.h linux-2.6.32.46/include/linux/slab.h
+--- linux-2.6.32.46/include/linux/slab.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/slab.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -60391,9 +63148,9 @@ diff -urNp linux-2.6.32.45/include/linux/slab.h linux-2.6.32.45/include/linux/sl
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-2.6.32.45/include/linux/slub_def.h linux-2.6.32.45/include/linux/slub_def.h
---- linux-2.6.32.45/include/linux/slub_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/slub_def.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/slub_def.h linux-2.6.32.46/include/linux/slub_def.h
+--- linux-2.6.32.46/include/linux/slub_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/slub_def.h	2011-08-05 20:33:55.000000000 -0400
 @@ -86,7 +86,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
@@ -60412,9 +63169,9 @@ diff -urNp linux-2.6.32.45/include/linux/slub_def.h linux-2.6.32.45/include/linu
  
  #ifdef CONFIG_KMEMTRACE
  extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
-diff -urNp linux-2.6.32.45/include/linux/sonet.h linux-2.6.32.45/include/linux/sonet.h
---- linux-2.6.32.45/include/linux/sonet.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sonet.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sonet.h linux-2.6.32.46/include/linux/sonet.h
+--- linux-2.6.32.46/include/linux/sonet.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sonet.h	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -60424,9 +63181,9 @@ diff -urNp linux-2.6.32.45/include/linux/sonet.h linux-2.6.32.45/include/linux/s
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-2.6.32.45/include/linux/sunrpc/cache.h linux-2.6.32.45/include/linux/sunrpc/cache.h
---- linux-2.6.32.45/include/linux/sunrpc/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sunrpc/cache.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sunrpc/cache.h linux-2.6.32.46/include/linux/sunrpc/cache.h
+--- linux-2.6.32.46/include/linux/sunrpc/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sunrpc/cache.h	2011-08-05 20:33:55.000000000 -0400
 @@ -125,7 +125,7 @@ struct cache_detail {
   */
  struct cache_req {
@@ -60436,9 +63193,9 @@ diff -urNp linux-2.6.32.45/include/linux/sunrpc/cache.h linux-2.6.32.45/include/
  /* this must be embedded in a deferred_request that is being
   * delayed awaiting cache-fill
   */
-diff -urNp linux-2.6.32.45/include/linux/sunrpc/clnt.h linux-2.6.32.45/include/linux/sunrpc/clnt.h
---- linux-2.6.32.45/include/linux/sunrpc/clnt.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sunrpc/clnt.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sunrpc/clnt.h linux-2.6.32.46/include/linux/sunrpc/clnt.h
+--- linux-2.6.32.46/include/linux/sunrpc/clnt.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sunrpc/clnt.h	2011-04-17 15:56:46.000000000 -0400
 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
@@ -60469,9 +63226,9 @@ diff -urNp linux-2.6.32.45/include/linux/sunrpc/clnt.h linux-2.6.32.45/include/l
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-2.6.32.45/include/linux/sunrpc/svc_rdma.h linux-2.6.32.45/include/linux/sunrpc/svc_rdma.h
---- linux-2.6.32.45/include/linux/sunrpc/svc_rdma.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sunrpc/svc_rdma.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h
+--- linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sunrpc/svc_rdma.h	2011-05-04 17:56:28.000000000 -0400
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -60497,9 +63254,9 @@ diff -urNp linux-2.6.32.45/include/linux/sunrpc/svc_rdma.h linux-2.6.32.45/inclu
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-2.6.32.45/include/linux/suspend.h linux-2.6.32.45/include/linux/suspend.h
---- linux-2.6.32.45/include/linux/suspend.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/suspend.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/suspend.h linux-2.6.32.46/include/linux/suspend.h
+--- linux-2.6.32.46/include/linux/suspend.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/suspend.h	2011-04-17 15:56:46.000000000 -0400
 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
   *	which require special recovery actions in that situation.
   */
@@ -60588,9 +63345,9 @@ diff -urNp linux-2.6.32.45/include/linux/suspend.h linux-2.6.32.45/include/linux
  static inline int hibernate(void) { return -ENOSYS; }
  static inline bool system_entering_hibernation(void) { return false; }
  #endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.32.45/include/linux/sysctl.h linux-2.6.32.45/include/linux/sysctl.h
---- linux-2.6.32.45/include/linux/sysctl.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sysctl.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sysctl.h linux-2.6.32.46/include/linux/sysctl.h
+--- linux-2.6.32.46/include/linux/sysctl.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sysctl.h	2011-04-17 15:56:46.000000000 -0400
 @@ -164,7 +164,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -60621,9 +63378,9 @@ diff -urNp linux-2.6.32.45/include/linux/sysctl.h linux-2.6.32.45/include/linux/
  extern ctl_handler sysctl_intvec;
  extern ctl_handler sysctl_jiffies;
  extern ctl_handler sysctl_ms_jiffies;
-diff -urNp linux-2.6.32.45/include/linux/sysfs.h linux-2.6.32.45/include/linux/sysfs.h
---- linux-2.6.32.45/include/linux/sysfs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/sysfs.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/sysfs.h linux-2.6.32.46/include/linux/sysfs.h
+--- linux-2.6.32.46/include/linux/sysfs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/sysfs.h	2011-04-17 15:56:46.000000000 -0400
 @@ -75,8 +75,8 @@ struct bin_attribute {
  };
  
@@ -60635,9 +63392,9 @@ diff -urNp linux-2.6.32.45/include/linux/sysfs.h linux-2.6.32.45/include/linux/s
  };
  
  struct sysfs_dirent;
-diff -urNp linux-2.6.32.45/include/linux/thread_info.h linux-2.6.32.45/include/linux/thread_info.h
---- linux-2.6.32.45/include/linux/thread_info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/thread_info.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/thread_info.h linux-2.6.32.46/include/linux/thread_info.h
+--- linux-2.6.32.46/include/linux/thread_info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/thread_info.h	2011-04-17 15:56:46.000000000 -0400
 @@ -23,7 +23,7 @@ struct restart_block {
  		};
  		/* For futex_wait and futex_wait_requeue_pi */
@@ -60647,9 +63404,9 @@ diff -urNp linux-2.6.32.45/include/linux/thread_info.h linux-2.6.32.45/include/l
  			u32 val;
  			u32 flags;
  			u32 bitset;
-diff -urNp linux-2.6.32.45/include/linux/tty.h linux-2.6.32.45/include/linux/tty.h
---- linux-2.6.32.45/include/linux/tty.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/tty.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/tty.h linux-2.6.32.46/include/linux/tty.h
+--- linux-2.6.32.46/include/linux/tty.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/tty.h	2011-08-05 20:33:55.000000000 -0400
 @@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void);
  /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
  extern void tty_ldisc_enable(struct tty_struct *tty);
@@ -60658,9 +63415,9 @@ diff -urNp linux-2.6.32.45/include/linux/tty.h linux-2.6.32.45/include/linux/tty
  /* n_tty.c */
  extern struct tty_ldisc_ops tty_ldisc_N_TTY;
  
-diff -urNp linux-2.6.32.45/include/linux/tty_ldisc.h linux-2.6.32.45/include/linux/tty_ldisc.h
---- linux-2.6.32.45/include/linux/tty_ldisc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/tty_ldisc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/tty_ldisc.h linux-2.6.32.46/include/linux/tty_ldisc.h
+--- linux-2.6.32.46/include/linux/tty_ldisc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/tty_ldisc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -139,7 +139,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -60670,9 +63427,9 @@ diff -urNp linux-2.6.32.45/include/linux/tty_ldisc.h linux-2.6.32.45/include/lin
  };
  
  struct tty_ldisc {
-diff -urNp linux-2.6.32.45/include/linux/types.h linux-2.6.32.45/include/linux/types.h
---- linux-2.6.32.45/include/linux/types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/types.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/types.h linux-2.6.32.46/include/linux/types.h
+--- linux-2.6.32.46/include/linux/types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/types.h	2011-04-17 15:56:46.000000000 -0400
 @@ -191,10 +191,26 @@ typedef struct {
  	volatile int counter;
  } atomic_t;
@@ -60700,9 +63457,9 @@ diff -urNp linux-2.6.32.45/include/linux/types.h linux-2.6.32.45/include/linux/t
  #endif
  
  struct ustat {
-diff -urNp linux-2.6.32.45/include/linux/uaccess.h linux-2.6.32.45/include/linux/uaccess.h
---- linux-2.6.32.45/include/linux/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/uaccess.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/uaccess.h linux-2.6.32.46/include/linux/uaccess.h
+--- linux-2.6.32.46/include/linux/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/uaccess.h	2011-04-17 15:56:46.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -60734,9 +63491,9 @@ diff -urNp linux-2.6.32.45/include/linux/uaccess.h linux-2.6.32.45/include/linux
 +extern long probe_kernel_write(void *dst, const void *src, size_t size);
  
  #endif		/* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.32.45/include/linux/unaligned/access_ok.h linux-2.6.32.45/include/linux/unaligned/access_ok.h
---- linux-2.6.32.45/include/linux/unaligned/access_ok.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/unaligned/access_ok.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/unaligned/access_ok.h linux-2.6.32.46/include/linux/unaligned/access_ok.h
+--- linux-2.6.32.46/include/linux/unaligned/access_ok.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/unaligned/access_ok.h	2011-04-17 15:56:46.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -60776,9 +63533,9 @@ diff -urNp linux-2.6.32.45/include/linux/unaligned/access_ok.h linux-2.6.32.45/i
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-2.6.32.45/include/linux/vmalloc.h linux-2.6.32.45/include/linux/vmalloc.h
---- linux-2.6.32.45/include/linux/vmalloc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/vmalloc.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/vmalloc.h linux-2.6.32.46/include/linux/vmalloc.h
+--- linux-2.6.32.46/include/linux/vmalloc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/vmalloc.h	2011-04-17 15:56:46.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_MAP		0x00000004	/* vmap()ed pages */
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
@@ -60873,9 +63630,9 @@ diff -urNp linux-2.6.32.45/include/linux/vmalloc.h linux-2.6.32.45/include/linux
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.32.45/include/linux/vmstat.h linux-2.6.32.45/include/linux/vmstat.h
---- linux-2.6.32.45/include/linux/vmstat.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/linux/vmstat.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/linux/vmstat.h linux-2.6.32.46/include/linux/vmstat.h
+--- linux-2.6.32.46/include/linux/vmstat.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/vmstat.h	2011-04-17 15:56:46.000000000 -0400
 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -60939,9 +63696,9 @@ diff -urNp linux-2.6.32.45/include/linux/vmstat.h linux-2.6.32.45/include/linux/
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-2.6.32.45/include/media/saa7146_vv.h linux-2.6.32.45/include/media/saa7146_vv.h
---- linux-2.6.32.45/include/media/saa7146_vv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/media/saa7146_vv.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/media/saa7146_vv.h linux-2.6.32.46/include/media/saa7146_vv.h
+--- linux-2.6.32.46/include/media/saa7146_vv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/media/saa7146_vv.h	2011-08-23 21:22:38.000000000 -0400
 @@ -167,7 +167,7 @@ struct saa7146_ext_vv
  	int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
  
@@ -60951,9 +63708,9 @@ diff -urNp linux-2.6.32.45/include/media/saa7146_vv.h linux-2.6.32.45/include/me
  	/* pointer to the saa7146 core ops */
  	const struct v4l2_ioctl_ops *core_ops;
  
-diff -urNp linux-2.6.32.45/include/media/v4l2-dev.h linux-2.6.32.45/include/media/v4l2-dev.h
---- linux-2.6.32.45/include/media/v4l2-dev.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/media/v4l2-dev.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/media/v4l2-dev.h linux-2.6.32.46/include/media/v4l2-dev.h
+--- linux-2.6.32.46/include/media/v4l2-dev.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/media/v4l2-dev.h	2011-08-05 20:33:55.000000000 -0400
 @@ -34,7 +34,7 @@ struct v4l2_device;
  #define V4L2_FL_UNREGISTERED	(0)
  
@@ -60963,9 +63720,9 @@ diff -urNp linux-2.6.32.45/include/media/v4l2-dev.h linux-2.6.32.45/include/medi
  	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
  	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
  	unsigned int (*poll) (struct file *, struct poll_table_struct *);
-diff -urNp linux-2.6.32.45/include/media/v4l2-device.h linux-2.6.32.45/include/media/v4l2-device.h
---- linux-2.6.32.45/include/media/v4l2-device.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/media/v4l2-device.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/media/v4l2-device.h linux-2.6.32.46/include/media/v4l2-device.h
+--- linux-2.6.32.46/include/media/v4l2-device.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/media/v4l2-device.h	2011-05-04 17:56:28.000000000 -0400
 @@ -71,7 +71,7 @@ int __must_check v4l2_device_register(st
     this function returns 0. If the name ends with a digit (e.g. cx18),
     then the name will be set to cx18-0 since cx180 looks really odd. */
@@ -60975,9 +63732,9 @@ diff -urNp linux-2.6.32.45/include/media/v4l2-device.h linux-2.6.32.45/include/m
  
  /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
     Since the parent disappears this ensures that v4l2_dev doesn't have an
-diff -urNp linux-2.6.32.45/include/media/v4l2-ioctl.h linux-2.6.32.45/include/media/v4l2-ioctl.h
---- linux-2.6.32.45/include/media/v4l2-ioctl.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/media/v4l2-ioctl.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/media/v4l2-ioctl.h linux-2.6.32.46/include/media/v4l2-ioctl.h
+--- linux-2.6.32.46/include/media/v4l2-ioctl.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/media/v4l2-ioctl.h	2011-08-23 21:22:38.000000000 -0400
 @@ -243,6 +243,7 @@ struct v4l2_ioctl_ops {
  	long (*vidioc_default)	       (struct file *file, void *fh,
  					int cmd, void *arg);
@@ -60986,9 +63743,9 @@ diff -urNp linux-2.6.32.45/include/media/v4l2-ioctl.h linux-2.6.32.45/include/me
  
  
  /* v4l debugging and diagnostics */
-diff -urNp linux-2.6.32.45/include/net/flow.h linux-2.6.32.45/include/net/flow.h
---- linux-2.6.32.45/include/net/flow.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/flow.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/flow.h linux-2.6.32.46/include/net/flow.h
+--- linux-2.6.32.46/include/net/flow.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/flow.h	2011-05-04 17:56:28.000000000 -0400
 @@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net
  extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
  			       u8 dir, flow_resolve_t resolver);
@@ -60998,9 +63755,9 @@ diff -urNp linux-2.6.32.45/include/net/flow.h linux-2.6.32.45/include/net/flow.h
  
  static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
  {
-diff -urNp linux-2.6.32.45/include/net/inetpeer.h linux-2.6.32.45/include/net/inetpeer.h
---- linux-2.6.32.45/include/net/inetpeer.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/inetpeer.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/inetpeer.h linux-2.6.32.46/include/net/inetpeer.h
+--- linux-2.6.32.46/include/net/inetpeer.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/inetpeer.h	2011-04-17 15:56:46.000000000 -0400
 @@ -24,7 +24,7 @@ struct inet_peer
  	__u32			dtime;		/* the time of last use of not
  						 * referenced entries */
@@ -61010,9 +63767,9 @@ diff -urNp linux-2.6.32.45/include/net/inetpeer.h linux-2.6.32.45/include/net/in
  	__u32			tcp_ts;
  	unsigned long		tcp_ts_stamp;
  };
-diff -urNp linux-2.6.32.45/include/net/ip_vs.h linux-2.6.32.45/include/net/ip_vs.h
---- linux-2.6.32.45/include/net/ip_vs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/ip_vs.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/ip_vs.h linux-2.6.32.46/include/net/ip_vs.h
+--- linux-2.6.32.46/include/net/ip_vs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/ip_vs.h	2011-05-04 17:56:28.000000000 -0400
 @@ -365,7 +365,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
@@ -61031,9 +63788,9 @@ diff -urNp linux-2.6.32.45/include/net/ip_vs.h linux-2.6.32.45/include/net/ip_vs
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff -urNp linux-2.6.32.45/include/net/irda/ircomm_core.h linux-2.6.32.45/include/net/irda/ircomm_core.h
---- linux-2.6.32.45/include/net/irda/ircomm_core.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/irda/ircomm_core.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/irda/ircomm_core.h linux-2.6.32.46/include/net/irda/ircomm_core.h
+--- linux-2.6.32.46/include/net/irda/ircomm_core.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/irda/ircomm_core.h	2011-08-05 20:33:55.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct {
  	int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
  	int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
@@ -61043,9 +63800,9 @@ diff -urNp linux-2.6.32.45/include/net/irda/ircomm_core.h linux-2.6.32.45/includ
  
  struct ircomm_cb {
  	irda_queue_t queue;
-diff -urNp linux-2.6.32.45/include/net/irda/ircomm_tty.h linux-2.6.32.45/include/net/irda/ircomm_tty.h
---- linux-2.6.32.45/include/net/irda/ircomm_tty.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/irda/ircomm_tty.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/irda/ircomm_tty.h linux-2.6.32.46/include/net/irda/ircomm_tty.h
+--- linux-2.6.32.46/include/net/irda/ircomm_tty.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/irda/ircomm_tty.h	2011-04-17 15:56:46.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -61065,9 +63822,9 @@ diff -urNp linux-2.6.32.45/include/net/irda/ircomm_tty.h linux-2.6.32.45/include
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-2.6.32.45/include/net/iucv/af_iucv.h linux-2.6.32.45/include/net/iucv/af_iucv.h
---- linux-2.6.32.45/include/net/iucv/af_iucv.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/iucv/af_iucv.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/iucv/af_iucv.h linux-2.6.32.46/include/net/iucv/af_iucv.h
+--- linux-2.6.32.46/include/net/iucv/af_iucv.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/iucv/af_iucv.h	2011-05-04 17:56:28.000000000 -0400
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
  	struct hlist_head head;
@@ -61077,9 +63834,9 @@ diff -urNp linux-2.6.32.45/include/net/iucv/af_iucv.h linux-2.6.32.45/include/ne
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-2.6.32.45/include/net/lapb.h linux-2.6.32.45/include/net/lapb.h
---- linux-2.6.32.45/include/net/lapb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/lapb.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/lapb.h linux-2.6.32.46/include/net/lapb.h
+--- linux-2.6.32.46/include/net/lapb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/lapb.h	2011-08-05 20:33:55.000000000 -0400
 @@ -95,7 +95,7 @@ struct lapb_cb {
  	struct sk_buff_head	write_queue;
  	struct sk_buff_head	ack_queue;
@@ -61089,9 +63846,9 @@ diff -urNp linux-2.6.32.45/include/net/lapb.h linux-2.6.32.45/include/net/lapb.h
  
  	/* FRMR control information */
  	struct lapb_frame	frmr_data;
-diff -urNp linux-2.6.32.45/include/net/neighbour.h linux-2.6.32.45/include/net/neighbour.h
---- linux-2.6.32.45/include/net/neighbour.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/neighbour.h	2011-08-26 20:29:08.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/neighbour.h linux-2.6.32.46/include/net/neighbour.h
+--- linux-2.6.32.46/include/net/neighbour.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/neighbour.h	2011-08-26 20:29:08.000000000 -0400
 @@ -131,7 +131,7 @@ struct neigh_ops
  	int			(*connected_output)(struct sk_buff*);
  	int			(*hh_output)(struct sk_buff*);
@@ -61101,9 +63858,9 @@ diff -urNp linux-2.6.32.45/include/net/neighbour.h linux-2.6.32.45/include/net/n
  
  struct pneigh_entry
  {
-diff -urNp linux-2.6.32.45/include/net/netlink.h linux-2.6.32.45/include/net/netlink.h
---- linux-2.6.32.45/include/net/netlink.h	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/include/net/netlink.h	2011-08-21 18:08:11.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/netlink.h linux-2.6.32.46/include/net/netlink.h
+--- linux-2.6.32.46/include/net/netlink.h	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/include/net/netlink.h	2011-08-21 18:08:11.000000000 -0400
 @@ -335,7 +335,7 @@ static inline int nlmsg_ok(const struct 
  {
  	return (remaining >= (int) sizeof(struct nlmsghdr) &&
@@ -61122,9 +63879,9 @@ diff -urNp linux-2.6.32.45/include/net/netlink.h linux-2.6.32.45/include/net/net
  }
  
  /**
-diff -urNp linux-2.6.32.45/include/net/netns/ipv4.h linux-2.6.32.45/include/net/netns/ipv4.h
---- linux-2.6.32.45/include/net/netns/ipv4.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/netns/ipv4.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/netns/ipv4.h linux-2.6.32.46/include/net/netns/ipv4.h
+--- linux-2.6.32.46/include/net/netns/ipv4.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/netns/ipv4.h	2011-05-04 17:56:28.000000000 -0400
 @@ -54,7 +54,7 @@ struct netns_ipv4 {
  	int current_rt_cache_rebuild_count;
  
@@ -61134,9 +63891,9 @@ diff -urNp linux-2.6.32.45/include/net/netns/ipv4.h linux-2.6.32.45/include/net/
  
  #ifdef CONFIG_IP_MROUTE
  	struct sock		*mroute_sk;
-diff -urNp linux-2.6.32.45/include/net/sctp/sctp.h linux-2.6.32.45/include/net/sctp/sctp.h
---- linux-2.6.32.45/include/net/sctp/sctp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/sctp/sctp.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/sctp/sctp.h linux-2.6.32.46/include/net/sctp/sctp.h
+--- linux-2.6.32.46/include/net/sctp/sctp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/sctp/sctp.h	2011-04-17 15:56:46.000000000 -0400
 @@ -305,8 +305,8 @@ extern int sctp_debug_flag;
  
  #else	/* SCTP_DEBUG */
@@ -61148,9 +63905,9 @@ diff -urNp linux-2.6.32.45/include/net/sctp/sctp.h linux-2.6.32.45/include/net/s
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.32.45/include/net/secure_seq.h linux-2.6.32.45/include/net/secure_seq.h
---- linux-2.6.32.45/include/net/secure_seq.h	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/include/net/secure_seq.h	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/secure_seq.h linux-2.6.32.46/include/net/secure_seq.h
+--- linux-2.6.32.46/include/net/secure_seq.h	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/include/net/secure_seq.h	2011-08-07 19:48:09.000000000 -0400
 @@ -7,14 +7,14 @@ extern __u32 secure_ip_id(__be32 daddr);
  extern __u32 secure_ipv6_id(const __be32 daddr[4]);
  extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
@@ -61170,9 +63927,9 @@ diff -urNp linux-2.6.32.45/include/net/secure_seq.h linux-2.6.32.45/include/net/
 +					__be16 sport, __be16 dport);
  
  #endif /* _NET_SECURE_SEQ */
-diff -urNp linux-2.6.32.45/include/net/sock.h linux-2.6.32.45/include/net/sock.h
---- linux-2.6.32.45/include/net/sock.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/sock.h	2011-08-21 17:24:37.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/sock.h linux-2.6.32.46/include/net/sock.h
+--- linux-2.6.32.46/include/net/sock.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/sock.h	2011-08-21 17:24:37.000000000 -0400
 @@ -272,7 +272,7 @@ struct sock {
  	rwlock_t		sk_callback_lock;
  	int			sk_err,
@@ -61191,9 +63948,9 @@ diff -urNp linux-2.6.32.45/include/net/sock.h linux-2.6.32.45/include/net/sock.h
  		int inc)
  {
  }
-diff -urNp linux-2.6.32.45/include/net/tcp.h linux-2.6.32.45/include/net/tcp.h
---- linux-2.6.32.45/include/net/tcp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/tcp.h	2011-08-23 21:29:10.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/tcp.h linux-2.6.32.46/include/net/tcp.h
+--- linux-2.6.32.46/include/net/tcp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/tcp.h	2011-08-23 21:29:10.000000000 -0400
 @@ -1444,8 +1444,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
@@ -61205,9 +63962,9 @@ diff -urNp linux-2.6.32.45/include/net/tcp.h linux-2.6.32.45/include/net/tcp.h
  };
  
  struct tcp_iter_state {
-diff -urNp linux-2.6.32.45/include/net/udp.h linux-2.6.32.45/include/net/udp.h
---- linux-2.6.32.45/include/net/udp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/net/udp.h	2011-08-23 21:29:34.000000000 -0400
+diff -urNp linux-2.6.32.46/include/net/udp.h linux-2.6.32.46/include/net/udp.h
+--- linux-2.6.32.46/include/net/udp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/net/udp.h	2011-08-23 21:29:34.000000000 -0400
 @@ -187,8 +187,8 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -61219,9 +63976,9 @@ diff -urNp linux-2.6.32.45/include/net/udp.h linux-2.6.32.45/include/net/udp.h
  };
  
  struct udp_iter_state {
-diff -urNp linux-2.6.32.45/include/rdma/iw_cm.h linux-2.6.32.45/include/rdma/iw_cm.h
---- linux-2.6.32.45/include/rdma/iw_cm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/rdma/iw_cm.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/rdma/iw_cm.h linux-2.6.32.46/include/rdma/iw_cm.h
+--- linux-2.6.32.46/include/rdma/iw_cm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/rdma/iw_cm.h	2011-08-05 20:33:55.000000000 -0400
 @@ -129,7 +129,7 @@ struct iw_cm_verbs {
  					 int backlog);
  
@@ -61231,9 +63988,9 @@ diff -urNp linux-2.6.32.45/include/rdma/iw_cm.h linux-2.6.32.45/include/rdma/iw_
  
  /**
   * iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-2.6.32.45/include/scsi/libfc.h linux-2.6.32.45/include/scsi/libfc.h
---- linux-2.6.32.45/include/scsi/libfc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/scsi/libfc.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/scsi/libfc.h linux-2.6.32.46/include/scsi/libfc.h
+--- linux-2.6.32.46/include/scsi/libfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/scsi/libfc.h	2011-08-23 21:22:38.000000000 -0400
 @@ -675,6 +675,7 @@ struct libfc_function_template {
  	 */
  	void (*disc_stop_final) (struct fc_lport *);
@@ -61251,9 +64008,9 @@ diff -urNp linux-2.6.32.45/include/scsi/libfc.h linux-2.6.32.45/include/scsi/lib
  	u8			link_up;
  	u8			qfull;
  	enum fc_lport_state	state;
-diff -urNp linux-2.6.32.45/include/scsi/scsi_device.h linux-2.6.32.45/include/scsi/scsi_device.h
---- linux-2.6.32.45/include/scsi/scsi_device.h	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/include/scsi/scsi_device.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/scsi/scsi_device.h linux-2.6.32.46/include/scsi/scsi_device.h
+--- linux-2.6.32.46/include/scsi/scsi_device.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/include/scsi/scsi_device.h	2011-05-04 17:56:28.000000000 -0400
 @@ -156,9 +156,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
@@ -61267,9 +64024,9 @@ diff -urNp linux-2.6.32.45/include/scsi/scsi_device.h linux-2.6.32.45/include/sc
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff -urNp linux-2.6.32.45/include/scsi/scsi_transport_fc.h linux-2.6.32.45/include/scsi/scsi_transport_fc.h
---- linux-2.6.32.45/include/scsi/scsi_transport_fc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/scsi/scsi_transport_fc.h	2011-08-26 20:19:09.000000000 -0400
+diff -urNp linux-2.6.32.46/include/scsi/scsi_transport_fc.h linux-2.6.32.46/include/scsi/scsi_transport_fc.h
+--- linux-2.6.32.46/include/scsi/scsi_transport_fc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/scsi/scsi_transport_fc.h	2011-08-26 20:19:09.000000000 -0400
 @@ -708,7 +708,7 @@ struct fc_function_template {
  	unsigned long	show_host_system_hostname:1;
  
@@ -61279,9 +64036,9 @@ diff -urNp linux-2.6.32.45/include/scsi/scsi_transport_fc.h linux-2.6.32.45/incl
  
  
  /**
-diff -urNp linux-2.6.32.45/include/sound/ac97_codec.h linux-2.6.32.45/include/sound/ac97_codec.h
---- linux-2.6.32.45/include/sound/ac97_codec.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/ac97_codec.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/ac97_codec.h linux-2.6.32.46/include/sound/ac97_codec.h
+--- linux-2.6.32.46/include/sound/ac97_codec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/ac97_codec.h	2011-04-17 15:56:46.000000000 -0400
 @@ -419,15 +419,15 @@
  struct snd_ac97;
  
@@ -61314,9 +64071,9 @@ diff -urNp linux-2.6.32.45/include/sound/ac97_codec.h linux-2.6.32.45/include/so
  	void *private_data;
  	void (*private_free) (struct snd_ac97 *ac97);
  	/* --- */
-diff -urNp linux-2.6.32.45/include/sound/ak4xxx-adda.h linux-2.6.32.45/include/sound/ak4xxx-adda.h
---- linux-2.6.32.45/include/sound/ak4xxx-adda.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/ak4xxx-adda.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/ak4xxx-adda.h linux-2.6.32.46/include/sound/ak4xxx-adda.h
+--- linux-2.6.32.46/include/sound/ak4xxx-adda.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/ak4xxx-adda.h	2011-08-05 20:33:55.000000000 -0400
 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
  	void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
  		      unsigned char val);
@@ -61326,9 +64083,9 @@ diff -urNp linux-2.6.32.45/include/sound/ak4xxx-adda.h linux-2.6.32.45/include/s
  
  #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
  
-diff -urNp linux-2.6.32.45/include/sound/hwdep.h linux-2.6.32.45/include/sound/hwdep.h
---- linux-2.6.32.45/include/sound/hwdep.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/hwdep.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/hwdep.h linux-2.6.32.46/include/sound/hwdep.h
+--- linux-2.6.32.46/include/sound/hwdep.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/hwdep.h	2011-08-05 20:33:55.000000000 -0400
 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
  			  struct snd_hwdep_dsp_status *status);
  	int (*dsp_load)(struct snd_hwdep *hw,
@@ -61338,9 +64095,9 @@ diff -urNp linux-2.6.32.45/include/sound/hwdep.h linux-2.6.32.45/include/sound/h
  
  struct snd_hwdep {
  	struct snd_card *card;
-diff -urNp linux-2.6.32.45/include/sound/info.h linux-2.6.32.45/include/sound/info.h
---- linux-2.6.32.45/include/sound/info.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/info.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/info.h linux-2.6.32.46/include/sound/info.h
+--- linux-2.6.32.46/include/sound/info.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/info.h	2011-08-05 20:33:55.000000000 -0400
 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
  		     struct snd_info_buffer *buffer);
  	void (*write)(struct snd_info_entry *entry,
@@ -61350,9 +64107,9 @@ diff -urNp linux-2.6.32.45/include/sound/info.h linux-2.6.32.45/include/sound/in
  
  struct snd_info_entry_ops {
  	int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-2.6.32.45/include/sound/pcm.h linux-2.6.32.45/include/sound/pcm.h
---- linux-2.6.32.45/include/sound/pcm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/pcm.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/pcm.h linux-2.6.32.46/include/sound/pcm.h
+--- linux-2.6.32.46/include/sound/pcm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/pcm.h	2011-08-23 21:22:38.000000000 -0400
 @@ -80,6 +80,7 @@ struct snd_pcm_ops {
  	int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
  	int (*ack)(struct snd_pcm_substream *substream);
@@ -61361,9 +64118,9 @@ diff -urNp linux-2.6.32.45/include/sound/pcm.h linux-2.6.32.45/include/sound/pcm
  
  /*
   *
-diff -urNp linux-2.6.32.45/include/sound/sb16_csp.h linux-2.6.32.45/include/sound/sb16_csp.h
---- linux-2.6.32.45/include/sound/sb16_csp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/sb16_csp.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/sb16_csp.h linux-2.6.32.46/include/sound/sb16_csp.h
+--- linux-2.6.32.46/include/sound/sb16_csp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/sb16_csp.h	2011-08-05 20:33:55.000000000 -0400
 @@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
  	int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
  	int (*csp_stop) (struct snd_sb_csp * p);
@@ -61373,9 +64130,9 @@ diff -urNp linux-2.6.32.45/include/sound/sb16_csp.h linux-2.6.32.45/include/soun
  
  /*
   * CSP private data
-diff -urNp linux-2.6.32.45/include/sound/ymfpci.h linux-2.6.32.45/include/sound/ymfpci.h
---- linux-2.6.32.45/include/sound/ymfpci.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/sound/ymfpci.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/include/sound/ymfpci.h linux-2.6.32.46/include/sound/ymfpci.h
+--- linux-2.6.32.46/include/sound/ymfpci.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/sound/ymfpci.h	2011-05-04 17:56:28.000000000 -0400
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
  	spinlock_t reg_lock;
  	spinlock_t voice_lock;
@@ -61385,9 +64142,9 @@ diff -urNp linux-2.6.32.45/include/sound/ymfpci.h linux-2.6.32.45/include/sound/
  	struct snd_info_entry *proc_entry;
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
-diff -urNp linux-2.6.32.45/include/trace/events/irq.h linux-2.6.32.45/include/trace/events/irq.h
---- linux-2.6.32.45/include/trace/events/irq.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/trace/events/irq.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/trace/events/irq.h linux-2.6.32.46/include/trace/events/irq.h
+--- linux-2.6.32.46/include/trace/events/irq.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/trace/events/irq.h	2011-04-17 15:56:46.000000000 -0400
 @@ -34,7 +34,7 @@
   */
  TRACE_EVENT(irq_handler_entry,
@@ -61424,9 +64181,9 @@ diff -urNp linux-2.6.32.45/include/trace/events/irq.h linux-2.6.32.45/include/tr
  
  	TP_ARGS(h, vec),
  
-diff -urNp linux-2.6.32.45/include/video/uvesafb.h linux-2.6.32.45/include/video/uvesafb.h
---- linux-2.6.32.45/include/video/uvesafb.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/include/video/uvesafb.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/include/video/uvesafb.h linux-2.6.32.46/include/video/uvesafb.h
+--- linux-2.6.32.46/include/video/uvesafb.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/video/uvesafb.h	2011-04-17 15:56:46.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -61435,9 +64192,9 @@ diff -urNp linux-2.6.32.45/include/video/uvesafb.h linux-2.6.32.45/include/video
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-2.6.32.45/init/do_mounts.c linux-2.6.32.45/init/do_mounts.c
---- linux-2.6.32.45/init/do_mounts.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/init/do_mounts.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/init/do_mounts.c linux-2.6.32.46/init/do_mounts.c
+--- linux-2.6.32.46/init/do_mounts.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/init/do_mounts.c	2011-04-17 15:56:46.000000000 -0400
 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -61483,9 +64240,9 @@ diff -urNp linux-2.6.32.45/init/do_mounts.c linux-2.6.32.45/init/do_mounts.c
 +	sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
 +	sys_chroot((__force char __user *)".");
  }
-diff -urNp linux-2.6.32.45/init/do_mounts.h linux-2.6.32.45/init/do_mounts.h
---- linux-2.6.32.45/init/do_mounts.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/init/do_mounts.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/init/do_mounts.h linux-2.6.32.46/init/do_mounts.h
+--- linux-2.6.32.46/init/do_mounts.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/init/do_mounts.h	2011-04-17 15:56:46.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -61505,9 +64262,9 @@ diff -urNp linux-2.6.32.45/init/do_mounts.h linux-2.6.32.45/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-2.6.32.45/init/do_mounts_initrd.c linux-2.6.32.45/init/do_mounts_initrd.c
---- linux-2.6.32.45/init/do_mounts_initrd.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/init/do_mounts_initrd.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/init/do_mounts_initrd.c linux-2.6.32.46/init/do_mounts_initrd.c
+--- linux-2.6.32.46/init/do_mounts_initrd.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/init/do_mounts_initrd.c	2011-04-17 15:56:46.000000000 -0400
 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
  	sys_close(old_fd);sys_close(root_fd);
  	sys_close(0);sys_close(1);sys_close(2);
@@ -61591,9 +64348,9 @@ diff -urNp linux-2.6.32.45/init/do_mounts_initrd.c linux-2.6.32.45/init/do_mount
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-2.6.32.45/init/do_mounts_md.c linux-2.6.32.45/init/do_mounts_md.c
---- linux-2.6.32.45/init/do_mounts_md.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/init/do_mounts_md.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/init/do_mounts_md.c linux-2.6.32.46/init/do_mounts_md.c
+--- linux-2.6.32.46/init/do_mounts_md.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/init/do_mounts_md.c	2011-04-17 15:56:46.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -61621,9 +64378,9 @@ diff -urNp linux-2.6.32.45/init/do_mounts_md.c linux-2.6.32.45/init/do_mounts_md
  	if (fd >= 0) {
  		sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
  		sys_close(fd);
-diff -urNp linux-2.6.32.45/init/initramfs.c linux-2.6.32.45/init/initramfs.c
---- linux-2.6.32.45/init/initramfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/init/initramfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/init/initramfs.c linux-2.6.32.46/init/initramfs.c
+--- linux-2.6.32.46/init/initramfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/init/initramfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -61732,9 +64489,9 @@ diff -urNp linux-2.6.32.45/init/initramfs.c linux-2.6.32.45/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-2.6.32.45/init/Kconfig linux-2.6.32.45/init/Kconfig
---- linux-2.6.32.45/init/Kconfig	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/init/Kconfig	2011-05-10 22:12:34.000000000 -0400
+diff -urNp linux-2.6.32.46/init/Kconfig linux-2.6.32.46/init/Kconfig
+--- linux-2.6.32.46/init/Kconfig	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/init/Kconfig	2011-05-10 22:12:34.000000000 -0400
 @@ -1004,7 +1004,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
@@ -61744,9 +64501,9 @@ diff -urNp linux-2.6.32.45/init/Kconfig linux-2.6.32.45/init/Kconfig
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-2.6.32.45/init/main.c linux-2.6.32.45/init/main.c
---- linux-2.6.32.45/init/main.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/init/main.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/init/main.c linux-2.6.32.46/init/main.c
+--- linux-2.6.32.46/init/main.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/init/main.c	2011-08-05 20:33:55.000000000 -0400
 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 
  #ifdef CONFIG_TC
  extern void tc_init(void);
@@ -61890,9 +64647,9 @@ diff -urNp linux-2.6.32.45/init/main.c linux-2.6.32.45/init/main.c
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.32.45/init/noinitramfs.c linux-2.6.32.45/init/noinitramfs.c
---- linux-2.6.32.45/init/noinitramfs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/init/noinitramfs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/init/noinitramfs.c linux-2.6.32.46/init/noinitramfs.c
+--- linux-2.6.32.46/init/noinitramfs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/init/noinitramfs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -29,7 +29,7 @@ static int __init default_rootfs(void)
  {
  	int err;
@@ -61911,9 +64668,9 @@ diff -urNp linux-2.6.32.45/init/noinitramfs.c linux-2.6.32.45/init/noinitramfs.c
  	if (err < 0)
  		goto out;
  
-diff -urNp linux-2.6.32.45/ipc/mqueue.c linux-2.6.32.45/ipc/mqueue.c
---- linux-2.6.32.45/ipc/mqueue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/ipc/mqueue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/ipc/mqueue.c linux-2.6.32.46/ipc/mqueue.c
+--- linux-2.6.32.46/ipc/mqueue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/ipc/mqueue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -61922,9 +64679,9 @@ diff -urNp linux-2.6.32.45/ipc/mqueue.c linux-2.6.32.45/ipc/mqueue.c
  			spin_lock(&mq_lock);
  			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		 	    u->mq_bytes + mq_bytes >
-diff -urNp linux-2.6.32.45/ipc/msg.c linux-2.6.32.45/ipc/msg.c
---- linux-2.6.32.45/ipc/msg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/ipc/msg.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/ipc/msg.c linux-2.6.32.46/ipc/msg.c
+--- linux-2.6.32.46/ipc/msg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/ipc/msg.c	2011-08-05 20:33:55.000000000 -0400
 @@ -310,18 +310,19 @@ static inline int msg_security(struct ke
  	return security_msg_queue_associate(msq, msgflg);
  }
@@ -61950,9 +64707,9 @@ diff -urNp linux-2.6.32.45/ipc/msg.c linux-2.6.32.45/ipc/msg.c
  	msg_params.key = key;
  	msg_params.flg = msgflg;
  
-diff -urNp linux-2.6.32.45/ipc/sem.c linux-2.6.32.45/ipc/sem.c
---- linux-2.6.32.45/ipc/sem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/ipc/sem.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/ipc/sem.c linux-2.6.32.46/ipc/sem.c
+--- linux-2.6.32.46/ipc/sem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/ipc/sem.c	2011-08-05 20:33:55.000000000 -0400
 @@ -309,10 +309,15 @@ static inline int sem_more_checks(struct
  	return 0;
  }
@@ -61999,9 +64756,9 @@ diff -urNp linux-2.6.32.45/ipc/sem.c linux-2.6.32.45/ipc/sem.c
  	ns = current->nsproxy->ipc_ns;
  
  	if (nsops < 1 || semid < 0)
-diff -urNp linux-2.6.32.45/ipc/shm.c linux-2.6.32.45/ipc/shm.c
---- linux-2.6.32.45/ipc/shm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/ipc/shm.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/ipc/shm.c linux-2.6.32.46/ipc/shm.c
+--- linux-2.6.32.46/ipc/shm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/ipc/shm.c	2011-08-05 20:33:55.000000000 -0400
 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -62079,9 +64836,9 @@ diff -urNp linux-2.6.32.45/ipc/shm.c linux-2.6.32.45/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-2.6.32.45/kernel/acct.c linux-2.6.32.45/kernel/acct.c
---- linux-2.6.32.45/kernel/acct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/acct.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/acct.c linux-2.6.32.46/kernel/acct.c
+--- linux-2.6.32.46/kernel/acct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/acct.c	2011-04-17 15:56:46.000000000 -0400
 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -62091,9 +64848,9 @@ diff -urNp linux-2.6.32.45/kernel/acct.c linux-2.6.32.45/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-2.6.32.45/kernel/audit.c linux-2.6.32.45/kernel/audit.c
---- linux-2.6.32.45/kernel/audit.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/audit.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/audit.c linux-2.6.32.46/kernel/audit.c
+--- linux-2.6.32.46/kernel/audit.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/audit.c	2011-05-04 17:56:28.000000000 -0400
 @@ -110,7 +110,7 @@ u32		audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
@@ -62143,9 +64900,9 @@ diff -urNp linux-2.6.32.45/kernel/audit.c linux-2.6.32.45/kernel/audit.c
  		break;
  	}
  	case AUDIT_TTY_SET: {
-diff -urNp linux-2.6.32.45/kernel/auditsc.c linux-2.6.32.45/kernel/auditsc.c
---- linux-2.6.32.45/kernel/auditsc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/auditsc.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/auditsc.c linux-2.6.32.46/kernel/auditsc.c
+--- linux-2.6.32.46/kernel/auditsc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/auditsc.c	2011-05-04 17:56:28.000000000 -0400
 @@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -62164,9 +64921,9 @@ diff -urNp linux-2.6.32.45/kernel/auditsc.c linux-2.6.32.45/kernel/auditsc.c
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff -urNp linux-2.6.32.45/kernel/capability.c linux-2.6.32.45/kernel/capability.c
---- linux-2.6.32.45/kernel/capability.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/capability.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/capability.c linux-2.6.32.46/kernel/capability.c
+--- linux-2.6.32.46/kernel/capability.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/capability.c	2011-04-17 15:56:46.000000000 -0400
 @@ -305,10 +305,26 @@ int capable(int cap)
  		BUG();
  	}
@@ -62195,9 +64952,9 @@ diff -urNp linux-2.6.32.45/kernel/capability.c linux-2.6.32.45/kernel/capability
 +
  EXPORT_SYMBOL(capable);
 +EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.32.45/kernel/cgroup.c linux-2.6.32.45/kernel/cgroup.c
---- linux-2.6.32.45/kernel/cgroup.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/cgroup.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/cgroup.c linux-2.6.32.46/kernel/cgroup.c
+--- linux-2.6.32.46/kernel/cgroup.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/cgroup.c	2011-05-16 21:46:57.000000000 -0400
 @@ -536,6 +536,8 @@ static struct css_set *find_css_set(
  	struct hlist_head *hhead;
  	struct cg_cgroup_link *link;
@@ -62207,9 +64964,9 @@ diff -urNp linux-2.6.32.45/kernel/cgroup.c linux-2.6.32.45/kernel/cgroup.c
  	/* First see if we already have a cgroup group that matches
  	 * the desired set */
  	read_lock(&css_set_lock);
-diff -urNp linux-2.6.32.45/kernel/configs.c linux-2.6.32.45/kernel/configs.c
---- linux-2.6.32.45/kernel/configs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/configs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/configs.c linux-2.6.32.46/kernel/configs.c
+--- linux-2.6.32.46/kernel/configs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/configs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -62230,9 +64987,9 @@ diff -urNp linux-2.6.32.45/kernel/configs.c linux-2.6.32.45/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.45/kernel/cpu.c linux-2.6.32.45/kernel/cpu.c
---- linux-2.6.32.45/kernel/cpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/cpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/cpu.c linux-2.6.32.46/kernel/cpu.c
+--- linux-2.6.32.46/kernel/cpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/cpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@
  /* Serializes the updates to cpu_online_mask, cpu_present_mask */
  static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -62242,9 +64999,9 @@ diff -urNp linux-2.6.32.45/kernel/cpu.c linux-2.6.32.45/kernel/cpu.c
  
  /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
   * Should always be manipulated under cpu_add_remove_lock
-diff -urNp linux-2.6.32.45/kernel/cred.c linux-2.6.32.45/kernel/cred.c
---- linux-2.6.32.45/kernel/cred.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/cred.c	2011-08-11 19:49:38.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/cred.c linux-2.6.32.46/kernel/cred.c
+--- linux-2.6.32.46/kernel/cred.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/cred.c	2011-08-11 19:49:38.000000000 -0400
 @@ -160,6 +160,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -62393,9 +65150,9 @@ diff -urNp linux-2.6.32.45/kernel/cred.c linux-2.6.32.45/kernel/cred.c
  	ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-2.6.32.45/kernel/exit.c linux-2.6.32.45/kernel/exit.c
---- linux-2.6.32.45/kernel/exit.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/exit.c	2011-08-17 19:19:50.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/exit.c linux-2.6.32.46/kernel/exit.c
+--- linux-2.6.32.46/kernel/exit.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/exit.c	2011-08-17 19:19:50.000000000 -0400
 @@ -55,6 +55,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -62526,9 +65283,9 @@ diff -urNp linux-2.6.32.45/kernel/exit.c linux-2.6.32.45/kernel/exit.c
  
  		get_task_struct(p);
  		read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.32.45/kernel/fork.c linux-2.6.32.45/kernel/fork.c
---- linux-2.6.32.45/kernel/fork.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/fork.c	2011-08-11 19:50:07.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/fork.c linux-2.6.32.46/kernel/fork.c
+--- linux-2.6.32.46/kernel/fork.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/fork.c	2011-08-11 19:50:07.000000000 -0400
 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
@@ -62670,9 +65427,9 @@ diff -urNp linux-2.6.32.45/kernel/fork.c linux-2.6.32.45/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
---- linux-2.6.32.45/kernel/futex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/futex.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/futex.c linux-2.6.32.46/kernel/futex.c
+--- linux-2.6.32.46/kernel/futex.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/kernel/futex.c	2011-08-29 22:25:07.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -62681,9 +65438,9 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  #include <linux/signal.h>
  #include <linux/module.h>
  #include <linux/magic.h>
-@@ -221,6 +222,11 @@ get_futex_key(u32 __user *uaddr, int fsh
+@@ -223,6 +224,11 @@ get_futex_key(u32 __user *uaddr, int fsh
  	struct page *page;
- 	int err;
+ 	int err, ro = 0;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
@@ -62693,7 +65450,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  	/*
  	 * The futex address must be "naturally" aligned.
  	 */
-@@ -1789,6 +1795,8 @@ static int futex_wait(u32 __user *uaddr,
+@@ -1819,6 +1825,8 @@ static int futex_wait(u32 __user *uaddr,
  	struct futex_q q;
  	int ret;
  
@@ -62702,7 +65459,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  	if (!bitset)
  		return -EINVAL;
  
-@@ -1841,7 +1849,7 @@ retry:
+@@ -1871,7 +1879,7 @@ retry:
  
  	restart = &current_thread_info()->restart_block;
  	restart->fn = futex_wait_restart;
@@ -62711,7 +65468,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  	restart->futex.val = val;
  	restart->futex.time = abs_time->tv64;
  	restart->futex.bitset = bitset;
-@@ -2203,6 +2211,8 @@ static int futex_wait_requeue_pi(u32 __u
+@@ -2233,6 +2241,8 @@ static int futex_wait_requeue_pi(u32 __u
  	struct futex_q q;
  	int res, ret;
  
@@ -62720,7 +65477,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  	if (!bitset)
  		return -EINVAL;
  
-@@ -2377,7 +2387,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2407,7 +2417,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
  {
  	struct robust_list_head __user *head;
  	unsigned long ret;
@@ -62730,7 +65487,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  
  	if (!futex_cmpxchg_enabled)
  		return -ENOSYS;
-@@ -2393,11 +2405,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+@@ -2423,11 +2435,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
  		if (!p)
  			goto err_unlock;
  		ret = -EPERM;
@@ -62747,7 +65504,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  		head = p->robust_list;
  		rcu_read_unlock();
  	}
-@@ -2459,7 +2476,7 @@ retry:
+@@ -2489,7 +2506,7 @@ retry:
   */
  static inline int fetch_robust_entry(struct robust_list __user **entry,
  				     struct robust_list __user * __user *head,
@@ -62756,7 +65513,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  {
  	unsigned long uentry;
  
-@@ -2640,6 +2657,7 @@ static int __init futex_init(void)
+@@ -2670,6 +2687,7 @@ static int __init futex_init(void)
  {
  	u32 curval;
  	int i;
@@ -62764,7 +65521,7 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  
  	/*
  	 * This will fail and we want it. Some arch implementations do
-@@ -2651,7 +2669,10 @@ static int __init futex_init(void)
+@@ -2681,7 +2699,10 @@ static int __init futex_init(void)
  	 * implementation, the non functional ones will return
  	 * -ENOSYS.
  	 */
@@ -62775,9 +65532,9 @@ diff -urNp linux-2.6.32.45/kernel/futex.c linux-2.6.32.45/kernel/futex.c
  	if (curval == -EFAULT)
  		futex_cmpxchg_enabled = 1;
  
-diff -urNp linux-2.6.32.45/kernel/futex_compat.c linux-2.6.32.45/kernel/futex_compat.c
---- linux-2.6.32.45/kernel/futex_compat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/futex_compat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/futex_compat.c linux-2.6.32.46/kernel/futex_compat.c
+--- linux-2.6.32.46/kernel/futex_compat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/futex_compat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -62815,9 +65572,9 @@ diff -urNp linux-2.6.32.45/kernel/futex_compat.c linux-2.6.32.45/kernel/futex_co
  		head = p->compat_robust_list;
  		read_unlock(&tasklist_lock);
  	}
-diff -urNp linux-2.6.32.45/kernel/gcov/base.c linux-2.6.32.45/kernel/gcov/base.c
---- linux-2.6.32.45/kernel/gcov/base.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/gcov/base.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/gcov/base.c linux-2.6.32.46/kernel/gcov/base.c
+--- linux-2.6.32.46/kernel/gcov/base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/gcov/base.c	2011-04-17 15:56:46.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -62839,9 +65596,9 @@ diff -urNp linux-2.6.32.45/kernel/gcov/base.c linux-2.6.32.45/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-2.6.32.45/kernel/hrtimer.c linux-2.6.32.45/kernel/hrtimer.c
---- linux-2.6.32.45/kernel/hrtimer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/hrtimer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/hrtimer.c linux-2.6.32.46/kernel/hrtimer.c
+--- linux-2.6.32.46/kernel/hrtimer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/hrtimer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
@@ -62851,9 +65608,9 @@ diff -urNp linux-2.6.32.45/kernel/hrtimer.c linux-2.6.32.45/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-2.6.32.45/kernel/kallsyms.c linux-2.6.32.45/kernel/kallsyms.c
---- linux-2.6.32.45/kernel/kallsyms.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/kallsyms.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/kallsyms.c linux-2.6.32.46/kernel/kallsyms.c
+--- linux-2.6.32.46/kernel/kallsyms.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/kallsyms.c	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -62956,9 +65713,9 @@ diff -urNp linux-2.6.32.45/kernel/kallsyms.c linux-2.6.32.45/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-2.6.32.45/kernel/kgdb.c linux-2.6.32.45/kernel/kgdb.c
---- linux-2.6.32.45/kernel/kgdb.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/kgdb.c linux-2.6.32.46/kernel/kgdb.c
+--- linux-2.6.32.46/kernel/kgdb.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
 @@ -86,7 +86,7 @@ static int			kgdb_io_module_registered;
  /* Guard for recursive entry */
  static int			exception_level;
@@ -63038,9 +65795,9 @@ diff -urNp linux-2.6.32.45/kernel/kgdb.c linux-2.6.32.45/kernel/kgdb.c
  }
  EXPORT_SYMBOL_GPL(kgdb_breakpoint);
  
-diff -urNp linux-2.6.32.45/kernel/kmod.c linux-2.6.32.45/kernel/kmod.c
---- linux-2.6.32.45/kernel/kmod.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/kmod.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/kmod.c linux-2.6.32.46/kernel/kmod.c
+--- linux-2.6.32.46/kernel/kmod.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/kmod.c	2011-04-17 15:56:46.000000000 -0400
 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -63134,9 +65891,9 @@ diff -urNp linux-2.6.32.45/kernel/kmod.c linux-2.6.32.45/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-2.6.32.45/kernel/kprobes.c linux-2.6.32.45/kernel/kprobes.c
---- linux-2.6.32.45/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/kprobes.c linux-2.6.32.46/kernel/kprobes.c
+--- linux-2.6.32.46/kernel/kprobes.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/kprobes.c	2011-04-17 15:56:46.000000000 -0400
 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
  	 * kernel image and loaded module images reside. This is required
  	 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -63173,9 +65930,9 @@ diff -urNp linux-2.6.32.45/kernel/kprobes.c linux-2.6.32.45/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-2.6.32.45/kernel/lockdep.c linux-2.6.32.45/kernel/lockdep.c
---- linux-2.6.32.45/kernel/lockdep.c	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/kernel/lockdep.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/lockdep.c linux-2.6.32.46/kernel/lockdep.c
+--- linux-2.6.32.46/kernel/lockdep.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/kernel/lockdep.c	2011-06-25 12:56:37.000000000 -0400
 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_t
  /*
   * Various lockdep statistics:
@@ -63249,9 +66006,9 @@ diff -urNp linux-2.6.32.45/kernel/lockdep.c linux-2.6.32.45/kernel/lockdep.c
  	if (very_verbose(class)) {
  		printk("\nacquire class [%p] %s", class->key, class->name);
  		if (class->name_version > 1)
-diff -urNp linux-2.6.32.45/kernel/lockdep_internals.h linux-2.6.32.45/kernel/lockdep_internals.h
---- linux-2.6.32.45/kernel/lockdep_internals.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/lockdep_internals.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/lockdep_internals.h linux-2.6.32.46/kernel/lockdep_internals.h
+--- linux-2.6.32.46/kernel/lockdep_internals.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/lockdep_internals.h	2011-04-17 15:56:46.000000000 -0400
 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_
  /*
   * Various lockdep statistics:
@@ -63299,9 +66056,9 @@ diff -urNp linux-2.6.32.45/kernel/lockdep_internals.h linux-2.6.32.45/kernel/loc
  #else
  # define debug_atomic_inc(ptr)		do { } while (0)
  # define debug_atomic_dec(ptr)		do { } while (0)
-diff -urNp linux-2.6.32.45/kernel/lockdep_proc.c linux-2.6.32.45/kernel/lockdep_proc.c
---- linux-2.6.32.45/kernel/lockdep_proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/lockdep_proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/lockdep_proc.c linux-2.6.32.46/kernel/lockdep_proc.c
+--- linux-2.6.32.46/kernel/lockdep_proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/lockdep_proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -63311,9 +66068,9 @@ diff -urNp linux-2.6.32.45/kernel/lockdep_proc.c linux-2.6.32.45/kernel/lockdep_
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-2.6.32.45/kernel/module.c linux-2.6.32.45/kernel/module.c
---- linux-2.6.32.45/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/module.c	2011-04-29 18:52:40.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/module.c linux-2.6.32.46/kernel/module.c
+--- linux-2.6.32.46/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/module.c	2011-04-29 18:52:40.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <linux/async.h>
  #include <linux/percpu.h>
@@ -63954,9 +66711,9 @@ diff -urNp linux-2.6.32.45/kernel/module.c linux-2.6.32.45/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-2.6.32.45/kernel/mutex.c linux-2.6.32.45/kernel/mutex.c
---- linux-2.6.32.45/kernel/mutex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/mutex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/mutex.c linux-2.6.32.46/kernel/mutex.c
+--- linux-2.6.32.46/kernel/mutex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/mutex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, 
  	 */
  
@@ -63994,9 +66751,9 @@ diff -urNp linux-2.6.32.45/kernel/mutex.c linux-2.6.32.45/kernel/mutex.c
  	mutex_set_owner(lock);
  
  	/* set it to 0 if there are no waiters left: */
-diff -urNp linux-2.6.32.45/kernel/mutex-debug.c linux-2.6.32.45/kernel/mutex-debug.c
---- linux-2.6.32.45/kernel/mutex-debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/mutex-debug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/mutex-debug.c linux-2.6.32.46/kernel/mutex-debug.c
+--- linux-2.6.32.46/kernel/mutex-debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/mutex-debug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -64034,9 +66791,9 @@ diff -urNp linux-2.6.32.45/kernel/mutex-debug.c linux-2.6.32.45/kernel/mutex-deb
  	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
  	mutex_clear_owner(lock);
  }
-diff -urNp linux-2.6.32.45/kernel/mutex-debug.h linux-2.6.32.45/kernel/mutex-debug.h
---- linux-2.6.32.45/kernel/mutex-debug.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/mutex-debug.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/mutex-debug.h linux-2.6.32.46/kernel/mutex-debug.h
+--- linux-2.6.32.46/kernel/mutex-debug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/mutex-debug.h	2011-04-17 15:56:46.000000000 -0400
 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -64057,9 +66814,9 @@ diff -urNp linux-2.6.32.45/kernel/mutex-debug.h linux-2.6.32.45/kernel/mutex-deb
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.32.45/kernel/mutex.h linux-2.6.32.45/kernel/mutex.h
---- linux-2.6.32.45/kernel/mutex.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/mutex.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/mutex.h linux-2.6.32.46/kernel/mutex.h
+--- linux-2.6.32.46/kernel/mutex.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/mutex.h	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@
  #ifdef CONFIG_SMP
  static inline void mutex_set_owner(struct mutex *lock)
@@ -64069,9 +66826,9 @@ diff -urNp linux-2.6.32.45/kernel/mutex.h linux-2.6.32.45/kernel/mutex.h
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
-diff -urNp linux-2.6.32.45/kernel/panic.c linux-2.6.32.45/kernel/panic.c
---- linux-2.6.32.45/kernel/panic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/panic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/panic.c linux-2.6.32.46/kernel/panic.c
+--- linux-2.6.32.46/kernel/panic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/panic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -352,7 +352,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
@@ -64091,9 +66848,9 @@ diff -urNp linux-2.6.32.45/kernel/panic.c linux-2.6.32.45/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.32.45/kernel/params.c linux-2.6.32.45/kernel/params.c
---- linux-2.6.32.45/kernel/params.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/params.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/params.c linux-2.6.32.46/kernel/params.c
+--- linux-2.6.32.46/kernel/params.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/params.c	2011-04-17 15:56:46.000000000 -0400
 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 
  	return ret;
  }
@@ -64112,9 +66869,9 @@ diff -urNp linux-2.6.32.45/kernel/params.c linux-2.6.32.45/kernel/params.c
  	.filter = uevent_filter,
  };
  
-diff -urNp linux-2.6.32.45/kernel/perf_event.c linux-2.6.32.45/kernel/perf_event.c
---- linux-2.6.32.45/kernel/perf_event.c	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/kernel/perf_event.c	2011-08-09 18:34:01.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/perf_event.c linux-2.6.32.46/kernel/perf_event.c
+--- linux-2.6.32.46/kernel/perf_event.c	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/kernel/perf_event.c	2011-08-09 18:34:01.000000000 -0400
 @@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostl
   */
  int sysctl_perf_event_sample_rate __read_mostly = 100000;
@@ -64320,9 +67077,9 @@ diff -urNp linux-2.6.32.45/kernel/perf_event.c linux-2.6.32.45/kernel/perf_event
  		     &parent_event->child_total_time_running);
  
  	/*
-diff -urNp linux-2.6.32.45/kernel/pid.c linux-2.6.32.45/kernel/pid.c
---- linux-2.6.32.45/kernel/pid.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.45/kernel/pid.c	2011-08-21 19:11:29.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/pid.c linux-2.6.32.46/kernel/pid.c
+--- linux-2.6.32.46/kernel/pid.c	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.46/kernel/pid.c	2011-08-21 19:11:29.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -64368,9 +67125,9 @@ diff -urNp linux-2.6.32.45/kernel/pid.c linux-2.6.32.45/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
  	struct pid *pid;
-diff -urNp linux-2.6.32.45/kernel/posix-cpu-timers.c linux-2.6.32.45/kernel/posix-cpu-timers.c
---- linux-2.6.32.45/kernel/posix-cpu-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/posix-cpu-timers.c	2011-08-06 09:33:44.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/posix-cpu-timers.c linux-2.6.32.46/kernel/posix-cpu-timers.c
+--- linux-2.6.32.46/kernel/posix-cpu-timers.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/posix-cpu-timers.c	2011-08-06 09:33:44.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -64397,9 +67154,9 @@ diff -urNp linux-2.6.32.45/kernel/posix-cpu-timers.c linux-2.6.32.45/kernel/posi
  		.clock_getres = thread_cpu_clock_getres,
  		.clock_get = thread_cpu_clock_get,
  		.clock_set = do_posix_clock_nosettime,
-diff -urNp linux-2.6.32.45/kernel/posix-timers.c linux-2.6.32.45/kernel/posix-timers.c
---- linux-2.6.32.45/kernel/posix-timers.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/posix-timers.c	2011-08-23 20:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/posix-timers.c linux-2.6.32.46/kernel/posix-timers.c
+--- linux-2.6.32.46/kernel/posix-timers.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/posix-timers.c	2011-08-23 20:22:38.000000000 -0400
 @@ -42,6 +42,7 @@
  #include <linux/compiler.h>
  #include <linux/idr.h>
@@ -64518,9 +67275,9 @@ diff -urNp linux-2.6.32.45/kernel/posix-timers.c linux-2.6.32.45/kernel/posix-ti
  	return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
  }
  
-diff -urNp linux-2.6.32.45/kernel/power/hibernate.c linux-2.6.32.45/kernel/power/hibernate.c
---- linux-2.6.32.45/kernel/power/hibernate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/power/hibernate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/power/hibernate.c linux-2.6.32.46/kernel/power/hibernate.c
+--- linux-2.6.32.46/kernel/power/hibernate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/power/hibernate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -48,14 +48,14 @@ enum {
  
  static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -64538,9 +67295,9 @@ diff -urNp linux-2.6.32.45/kernel/power/hibernate.c linux-2.6.32.45/kernel/power
  {
  	if (ops && !(ops->begin && ops->end &&  ops->pre_snapshot
  	    && ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.32.45/kernel/power/poweroff.c linux-2.6.32.45/kernel/power/poweroff.c
---- linux-2.6.32.45/kernel/power/poweroff.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/power/poweroff.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/power/poweroff.c linux-2.6.32.46/kernel/power/poweroff.c
+--- linux-2.6.32.46/kernel/power/poweroff.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/power/poweroff.c	2011-04-17 15:56:46.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
@@ -64550,9 +67307,9 @@ diff -urNp linux-2.6.32.45/kernel/power/poweroff.c linux-2.6.32.45/kernel/power/
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-2.6.32.45/kernel/power/process.c linux-2.6.32.45/kernel/power/process.c
---- linux-2.6.32.45/kernel/power/process.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/power/process.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/power/process.c linux-2.6.32.46/kernel/power/process.c
+--- linux-2.6.32.46/kernel/power/process.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/power/process.c	2011-04-17 15:56:46.000000000 -0400
 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
  	struct timeval start, end;
  	u64 elapsed_csecs64;
@@ -64592,9 +67349,9 @@ diff -urNp linux-2.6.32.45/kernel/power/process.c linux-2.6.32.45/kernel/power/p
  
  	do_gettimeofday(&end);
  	elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-diff -urNp linux-2.6.32.45/kernel/power/suspend.c linux-2.6.32.45/kernel/power/suspend.c
---- linux-2.6.32.45/kernel/power/suspend.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/power/suspend.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/power/suspend.c linux-2.6.32.46/kernel/power/suspend.c
+--- linux-2.6.32.46/kernel/power/suspend.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/power/suspend.c	2011-04-17 15:56:46.000000000 -0400
 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
  	[PM_SUSPEND_MEM]	= "mem",
  };
@@ -64611,9 +67368,9 @@ diff -urNp linux-2.6.32.45/kernel/power/suspend.c linux-2.6.32.45/kernel/power/s
  {
  	mutex_lock(&pm_mutex);
  	suspend_ops = ops;
-diff -urNp linux-2.6.32.45/kernel/printk.c linux-2.6.32.45/kernel/printk.c
---- linux-2.6.32.45/kernel/printk.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/printk.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/printk.c linux-2.6.32.46/kernel/printk.c
+--- linux-2.6.32.46/kernel/printk.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/printk.c	2011-04-17 15:56:46.000000000 -0400
 @@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
  	char c;
  	int error = 0;
@@ -64626,9 +67383,9 @@ diff -urNp linux-2.6.32.45/kernel/printk.c linux-2.6.32.45/kernel/printk.c
  	error = security_syslog(type);
  	if (error)
  		return error;
-diff -urNp linux-2.6.32.45/kernel/profile.c linux-2.6.32.45/kernel/profile.c
---- linux-2.6.32.45/kernel/profile.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/profile.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/profile.c linux-2.6.32.46/kernel/profile.c
+--- linux-2.6.32.46/kernel/profile.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/profile.c	2011-05-04 17:56:28.000000000 -0400
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -64686,9 +67443,9 @@ diff -urNp linux-2.6.32.45/kernel/profile.c linux-2.6.32.45/kernel/profile.c
  	return count;
  }
  
-diff -urNp linux-2.6.32.45/kernel/ptrace.c linux-2.6.32.45/kernel/ptrace.c
---- linux-2.6.32.45/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/ptrace.c	2011-05-22 23:02:06.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/ptrace.c linux-2.6.32.46/kernel/ptrace.c
+--- linux-2.6.32.46/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/ptrace.c	2011-05-22 23:02:06.000000000 -0400
 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
@@ -64870,9 +67627,9 @@ diff -urNp linux-2.6.32.45/kernel/ptrace.c linux-2.6.32.45/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-2.6.32.45/kernel/rcutorture.c linux-2.6.32.45/kernel/rcutorture.c
---- linux-2.6.32.45/kernel/rcutorture.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/rcutorture.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/rcutorture.c linux-2.6.32.46/kernel/rcutorture.c
+--- linux-2.6.32.46/kernel/rcutorture.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/rcutorture.c	2011-05-04 17:56:28.000000000 -0400
 @@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
  	{ 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -65022,9 +67779,9 @@ diff -urNp linux-2.6.32.45/kernel/rcutorture.c linux-2.6.32.45/kernel/rcutorture
  	for_each_possible_cpu(cpu) {
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-2.6.32.45/kernel/rcutree.c linux-2.6.32.45/kernel/rcutree.c
---- linux-2.6.32.45/kernel/rcutree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/rcutree.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/rcutree.c linux-2.6.32.46/kernel/rcutree.c
+--- linux-2.6.32.46/kernel/rcutree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/rcutree.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
@@ -65034,9 +67791,9 @@ diff -urNp linux-2.6.32.45/kernel/rcutree.c linux-2.6.32.45/kernel/rcutree.c
  {
  	/*
  	 * Memory references from any prior RCU read-side critical sections
-diff -urNp linux-2.6.32.45/kernel/rcutree_plugin.h linux-2.6.32.45/kernel/rcutree_plugin.h
---- linux-2.6.32.45/kernel/rcutree_plugin.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/rcutree_plugin.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/rcutree_plugin.h linux-2.6.32.46/kernel/rcutree_plugin.h
+--- linux-2.6.32.46/kernel/rcutree_plugin.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/rcutree_plugin.h	2011-04-17 15:56:46.000000000 -0400
 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_swi
   */
  void __rcu_read_lock(void)
@@ -65055,9 +67812,9 @@ diff -urNp linux-2.6.32.45/kernel/rcutree_plugin.h linux-2.6.32.45/kernel/rcutre
  	    unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
  		rcu_read_unlock_special(t);
  }
-diff -urNp linux-2.6.32.45/kernel/relay.c linux-2.6.32.45/kernel/relay.c
---- linux-2.6.32.45/kernel/relay.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/relay.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/relay.c linux-2.6.32.46/kernel/relay.c
+--- linux-2.6.32.46/kernel/relay.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/relay.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
  			       unsigned int flags,
  			       int *nonpad_ret)
@@ -65077,9 +67834,9 @@ diff -urNp linux-2.6.32.45/kernel/relay.c linux-2.6.32.45/kernel/relay.c
  
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
-diff -urNp linux-2.6.32.45/kernel/resource.c linux-2.6.32.45/kernel/resource.c
---- linux-2.6.32.45/kernel/resource.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/resource.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/resource.c linux-2.6.32.46/kernel/resource.c
+--- linux-2.6.32.46/kernel/resource.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/resource.c	2011-04-17 15:56:46.000000000 -0400
 @@ -132,8 +132,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -65099,9 +67856,9 @@ diff -urNp linux-2.6.32.45/kernel/resource.c linux-2.6.32.45/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.32.45/kernel/rtmutex.c linux-2.6.32.45/kernel/rtmutex.c
---- linux-2.6.32.45/kernel/rtmutex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/rtmutex.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/rtmutex.c linux-2.6.32.46/kernel/rtmutex.c
+--- linux-2.6.32.46/kernel/rtmutex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/rtmutex.c	2011-04-17 15:56:46.000000000 -0400
 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
  	 */
  	spin_lock_irqsave(&pendowner->pi_lock, flags);
@@ -65111,9 +67868,9 @@ diff -urNp linux-2.6.32.45/kernel/rtmutex.c linux-2.6.32.45/kernel/rtmutex.c
  	WARN_ON(pendowner->pi_blocked_on != waiter);
  	WARN_ON(pendowner->pi_blocked_on->lock != lock);
  
-diff -urNp linux-2.6.32.45/kernel/rtmutex-tester.c linux-2.6.32.45/kernel/rtmutex-tester.c
---- linux-2.6.32.45/kernel/rtmutex-tester.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/rtmutex-tester.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/rtmutex-tester.c linux-2.6.32.46/kernel/rtmutex-tester.c
+--- linux-2.6.32.46/kernel/rtmutex-tester.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/rtmutex-tester.c	2011-05-04 17:56:28.000000000 -0400
 @@ -21,7 +21,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
@@ -65204,9 +67961,9 @@ diff -urNp linux-2.6.32.45/kernel/rtmutex-tester.c linux-2.6.32.45/kernel/rtmute
  		return;
  
  	case RTTEST_LOCKBKL:
-diff -urNp linux-2.6.32.45/kernel/sched.c linux-2.6.32.45/kernel/sched.c
---- linux-2.6.32.45/kernel/sched.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/sched.c	2011-08-21 19:29:25.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/sched.c linux-2.6.32.46/kernel/sched.c
+--- linux-2.6.32.46/kernel/sched.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/sched.c	2011-08-21 19:29:25.000000000 -0400
 @@ -2764,9 +2764,10 @@ void wake_up_new_task(struct task_struct
  {
  	unsigned long flags;
@@ -65296,9 +68053,9 @@ diff -urNp linux-2.6.32.45/kernel/sched.c linux-2.6.32.45/kernel/sched.c
  
  	if (cpu != group_first_cpu(sd->groups))
  		return;
-diff -urNp linux-2.6.32.45/kernel/signal.c linux-2.6.32.45/kernel/signal.c
---- linux-2.6.32.45/kernel/signal.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/kernel/signal.c	2011-08-16 21:15:58.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/signal.c linux-2.6.32.46/kernel/signal.c
+--- linux-2.6.32.46/kernel/signal.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/kernel/signal.c	2011-08-16 21:15:58.000000000 -0400
 @@ -41,12 +41,12 @@
  
  static struct kmem_cache *sigqueue_cachep;
@@ -65431,9 +68188,9 @@ diff -urNp linux-2.6.32.45/kernel/signal.c linux-2.6.32.45/kernel/signal.c
  	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
  		error = check_kill_permission(sig, info, p);
  		/*
-diff -urNp linux-2.6.32.45/kernel/smp.c linux-2.6.32.45/kernel/smp.c
---- linux-2.6.32.45/kernel/smp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/smp.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/smp.c linux-2.6.32.46/kernel/smp.c
+--- linux-2.6.32.46/kernel/smp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/smp.c	2011-04-17 15:56:46.000000000 -0400
 @@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void 
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -65461,9 +68218,9 @@ diff -urNp linux-2.6.32.45/kernel/smp.c linux-2.6.32.45/kernel/smp.c
  {
  	spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-2.6.32.45/kernel/softirq.c linux-2.6.32.45/kernel/softirq.c
---- linux-2.6.32.45/kernel/softirq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/softirq.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/softirq.c linux-2.6.32.46/kernel/softirq.c
+--- linux-2.6.32.46/kernel/softirq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/softirq.c	2011-08-05 20:33:55.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -65523,9 +68280,9 @@ diff -urNp linux-2.6.32.45/kernel/softirq.c linux-2.6.32.45/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-2.6.32.45/kernel/sys.c linux-2.6.32.45/kernel/sys.c
---- linux-2.6.32.45/kernel/sys.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/sys.c	2011-08-11 19:51:54.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/sys.c linux-2.6.32.46/kernel/sys.c
+--- linux-2.6.32.46/kernel/sys.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/sys.c	2011-08-11 19:51:54.000000000 -0400
 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
@@ -65685,9 +68442,9 @@ diff -urNp linux-2.6.32.45/kernel/sys.c linux-2.6.32.45/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-2.6.32.45/kernel/sysctl.c linux-2.6.32.45/kernel/sysctl.c
---- linux-2.6.32.45/kernel/sysctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/sysctl.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/sysctl.c linux-2.6.32.46/kernel/sysctl.c
+--- linux-2.6.32.46/kernel/sysctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/sysctl.c	2011-04-17 15:56:46.000000000 -0400
 @@ -63,6 +63,13 @@
  static int deprecated_sysctl_warning(struct __sysctl_args *args);
  
@@ -65919,9 +68676,9 @@ diff -urNp linux-2.6.32.45/kernel/sysctl.c linux-2.6.32.45/kernel/sysctl.c
 +EXPORT_SYMBOL(sysctl_string_modpriv);
  EXPORT_SYMBOL(sysctl_data);
  EXPORT_SYMBOL(unregister_sysctl_table);
-diff -urNp linux-2.6.32.45/kernel/sysctl_check.c linux-2.6.32.45/kernel/sysctl_check.c
---- linux-2.6.32.45/kernel/sysctl_check.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/sysctl_check.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/sysctl_check.c linux-2.6.32.46/kernel/sysctl_check.c
+--- linux-2.6.32.46/kernel/sysctl_check.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/sysctl_check.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *n
  		} else {
  			if ((table->strategy == sysctl_data) ||
@@ -65935,9 +68692,9 @@ diff -urNp linux-2.6.32.45/kernel/sysctl_check.c linux-2.6.32.45/kernel/sysctl_c
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-2.6.32.45/kernel/taskstats.c linux-2.6.32.45/kernel/taskstats.c
---- linux-2.6.32.45/kernel/taskstats.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/kernel/taskstats.c	2011-07-13 17:23:19.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/taskstats.c linux-2.6.32.46/kernel/taskstats.c
+--- linux-2.6.32.46/kernel/taskstats.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/kernel/taskstats.c	2011-07-13 17:23:19.000000000 -0400
 @@ -26,9 +26,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -65961,9 +68718,9 @@ diff -urNp linux-2.6.32.45/kernel/taskstats.c linux-2.6.32.45/kernel/taskstats.c
  	if (!alloc_cpumask_var(&mask, GFP_KERNEL))
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.45/kernel/time/tick-broadcast.c linux-2.6.32.45/kernel/time/tick-broadcast.c
---- linux-2.6.32.45/kernel/time/tick-broadcast.c	2011-05-23 16:56:59.000000000 -0400
-+++ linux-2.6.32.45/kernel/time/tick-broadcast.c	2011-05-23 16:57:13.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/time/tick-broadcast.c linux-2.6.32.46/kernel/time/tick-broadcast.c
+--- linux-2.6.32.46/kernel/time/tick-broadcast.c	2011-05-23 16:56:59.000000000 -0400
++++ linux-2.6.32.46/kernel/time/tick-broadcast.c	2011-05-23 16:57:13.000000000 -0400
 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
@@ -65973,9 +68730,9 @@ diff -urNp linux-2.6.32.45/kernel/time/tick-broadcast.c linux-2.6.32.45/kernel/t
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.32.45/kernel/time/timekeeping.c linux-2.6.32.45/kernel/time/timekeeping.c
---- linux-2.6.32.45/kernel/time/timekeeping.c	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/kernel/time/timekeeping.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/time/timekeeping.c linux-2.6.32.46/kernel/time/timekeeping.c
+--- linux-2.6.32.46/kernel/time/timekeeping.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/kernel/time/timekeeping.c	2011-06-25 12:56:37.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -66002,9 +68759,9 @@ diff -urNp linux-2.6.32.45/kernel/time/timekeeping.c linux-2.6.32.45/kernel/time
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-2.6.32.45/kernel/time/timer_list.c linux-2.6.32.45/kernel/time/timer_list.c
---- linux-2.6.32.45/kernel/time/timer_list.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/time/timer_list.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/time/timer_list.c linux-2.6.32.46/kernel/time/timer_list.c
+--- linux-2.6.32.46/kernel/time/timer_list.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/time/timer_list.c	2011-04-17 15:56:46.000000000 -0400
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -66046,9 +68803,9 @@ diff -urNp linux-2.6.32.45/kernel/time/timer_list.c linux-2.6.32.45/kernel/time/
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.32.45/kernel/time/timer_stats.c linux-2.6.32.45/kernel/time/timer_stats.c
---- linux-2.6.32.45/kernel/time/timer_stats.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/time/timer_stats.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/time/timer_stats.c linux-2.6.32.46/kernel/time/timer_stats.c
+--- linux-2.6.32.46/kernel/time/timer_stats.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/time/timer_stats.c	2011-05-04 17:56:28.000000000 -0400
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -66117,9 +68874,9 @@ diff -urNp linux-2.6.32.45/kernel/time/timer_stats.c linux-2.6.32.45/kernel/time
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-2.6.32.45/kernel/time.c linux-2.6.32.45/kernel/time.c
---- linux-2.6.32.45/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/time.c linux-2.6.32.46/kernel/time.c
+--- linux-2.6.32.46/kernel/time.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/time.c	2011-04-17 15:56:46.000000000 -0400
 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec 
  		return error;
  
@@ -66150,9 +68907,9 @@ diff -urNp linux-2.6.32.45/kernel/time.c linux-2.6.32.45/kernel/time.c
  {
  #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
  	return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.32.45/kernel/timer.c linux-2.6.32.45/kernel/timer.c
---- linux-2.6.32.45/kernel/timer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/timer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/timer.c linux-2.6.32.46/kernel/timer.c
+--- linux-2.6.32.46/kernel/timer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/timer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -66162,9 +68919,9 @@ diff -urNp linux-2.6.32.45/kernel/timer.c linux-2.6.32.45/kernel/timer.c
  {
  	struct tvec_base *base = __get_cpu_var(tvec_bases);
  
-diff -urNp linux-2.6.32.45/kernel/trace/blktrace.c linux-2.6.32.45/kernel/trace/blktrace.c
---- linux-2.6.32.45/kernel/trace/blktrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/blktrace.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/blktrace.c linux-2.6.32.46/kernel/trace/blktrace.c
+--- linux-2.6.32.46/kernel/trace/blktrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/blktrace.c	2011-05-04 17:56:28.000000000 -0400
 @@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct f
  	struct blk_trace *bt = filp->private_data;
  	char buf[16];
@@ -66192,9 +68949,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/blktrace.c linux-2.6.32.45/kernel/trace/
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-2.6.32.45/kernel/trace/ftrace.c linux-2.6.32.45/kernel/trace/ftrace.c
---- linux-2.6.32.45/kernel/trace/ftrace.c	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/ftrace.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/ftrace.c linux-2.6.32.46/kernel/trace/ftrace.c
+--- linux-2.6.32.46/kernel/trace/ftrace.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/ftrace.c	2011-06-25 12:56:37.000000000 -0400
 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, 
  
  	ip = rec->ip;
@@ -66216,9 +68973,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/ftrace.c linux-2.6.32.45/kernel/trace/ft
  }
  
  /*
-diff -urNp linux-2.6.32.45/kernel/trace/ring_buffer.c linux-2.6.32.45/kernel/trace/ring_buffer.c
---- linux-2.6.32.45/kernel/trace/ring_buffer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/ring_buffer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/ring_buffer.c linux-2.6.32.46/kernel/trace/ring_buffer.c
+--- linux-2.6.32.46/kernel/trace/ring_buffer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/ring_buffer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
   * the reader page). But if the next page is a header page,
   * its flags will be non zero.
@@ -66228,9 +68985,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/ring_buffer.c linux-2.6.32.45/kernel/tra
  rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
  		struct buffer_page *page, struct list_head *list)
  {
-diff -urNp linux-2.6.32.45/kernel/trace/trace.c linux-2.6.32.45/kernel/trace/trace.c
---- linux-2.6.32.45/kernel/trace/trace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/trace.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/trace.c linux-2.6.32.46/kernel/trace/trace.c
+--- linux-2.6.32.46/kernel/trace/trace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/trace.c	2011-05-16 21:46:57.000000000 -0400
 @@ -3193,6 +3193,8 @@ static ssize_t tracing_splice_read_pipe(
  	size_t rem;
  	unsigned int i;
@@ -66273,9 +69030,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/trace.c linux-2.6.32.45/kernel/trace/tra
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-2.6.32.45/kernel/trace/trace_events.c linux-2.6.32.45/kernel/trace/trace_events.c
---- linux-2.6.32.45/kernel/trace/trace_events.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/trace_events.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/trace_events.c linux-2.6.32.46/kernel/trace/trace_events.c
+--- linux-2.6.32.46/kernel/trace/trace_events.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/trace_events.c	2011-08-05 20:33:55.000000000 -0400
 @@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list
   * Modules must own their file_operations to keep up with
   * reference counting.
@@ -66326,9 +69083,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/trace_events.c linux-2.6.32.45/kernel/tr
  	}
  }
  
-diff -urNp linux-2.6.32.45/kernel/trace/trace_mmiotrace.c linux-2.6.32.45/kernel/trace/trace_mmiotrace.c
---- linux-2.6.32.45/kernel/trace/trace_mmiotrace.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/trace_mmiotrace.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/trace_mmiotrace.c linux-2.6.32.46/kernel/trace/trace_mmiotrace.c
+--- linux-2.6.32.46/kernel/trace/trace_mmiotrace.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/trace_mmiotrace.c	2011-05-04 17:56:28.000000000 -0400
 @@ -23,7 +23,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -66365,9 +69122,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/trace_mmiotrace.c linux-2.6.32.45/kernel
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff -urNp linux-2.6.32.45/kernel/trace/trace_output.c linux-2.6.32.45/kernel/trace/trace_output.c
---- linux-2.6.32.45/kernel/trace/trace_output.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/trace_output.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/trace_output.c linux-2.6.32.46/kernel/trace/trace_output.c
+--- linux-2.6.32.46/kernel/trace/trace_output.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/trace_output.c	2011-04-17 15:56:46.000000000 -0400
 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 
  		return 0;
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -66377,9 +69134,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/trace_output.c linux-2.6.32.45/kernel/tr
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-2.6.32.45/kernel/trace/trace_stack.c linux-2.6.32.45/kernel/trace/trace_stack.c
---- linux-2.6.32.45/kernel/trace/trace_stack.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/trace_stack.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/trace_stack.c linux-2.6.32.46/kernel/trace/trace_stack.c
+--- linux-2.6.32.46/kernel/trace/trace_stack.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/trace_stack.c	2011-04-17 15:56:46.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -66389,9 +69146,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/trace_stack.c linux-2.6.32.45/kernel/tra
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-2.6.32.45/kernel/trace/trace_workqueue.c linux-2.6.32.45/kernel/trace/trace_workqueue.c
---- linux-2.6.32.45/kernel/trace/trace_workqueue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/trace/trace_workqueue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/trace/trace_workqueue.c linux-2.6.32.46/kernel/trace/trace_workqueue.c
+--- linux-2.6.32.46/kernel/trace/trace_workqueue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/trace/trace_workqueue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -21,7 +21,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -66419,9 +69176,9 @@ diff -urNp linux-2.6.32.45/kernel/trace/trace_workqueue.c linux-2.6.32.45/kernel
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-2.6.32.45/kernel/user.c linux-2.6.32.45/kernel/user.c
---- linux-2.6.32.45/kernel/user.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/kernel/user.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/kernel/user.c linux-2.6.32.46/kernel/user.c
+--- linux-2.6.32.46/kernel/user.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/user.c	2011-04-17 15:56:46.000000000 -0400
 @@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct use
  		spin_lock_irq(&uidhash_lock);
  		up = uid_hash_find(uid, hashent);
@@ -66430,9 +69187,9 @@ diff -urNp linux-2.6.32.45/kernel/user.c linux-2.6.32.45/kernel/user.c
  			key_put(new->uid_keyring);
  			key_put(new->session_keyring);
  			kmem_cache_free(uid_cachep, new);
-diff -urNp linux-2.6.32.45/lib/bug.c linux-2.6.32.45/lib/bug.c
---- linux-2.6.32.45/lib/bug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/bug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/bug.c linux-2.6.32.46/lib/bug.c
+--- linux-2.6.32.46/lib/bug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/bug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
@@ -66442,9 +69199,9 @@ diff -urNp linux-2.6.32.45/lib/bug.c linux-2.6.32.45/lib/bug.c
  
  	printk(KERN_EMERG "------------[ cut here ]------------\n");
  
-diff -urNp linux-2.6.32.45/lib/debugobjects.c linux-2.6.32.45/lib/debugobjects.c
---- linux-2.6.32.45/lib/debugobjects.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/lib/debugobjects.c	2011-07-13 17:23:19.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/debugobjects.c linux-2.6.32.46/lib/debugobjects.c
+--- linux-2.6.32.46/lib/debugobjects.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/lib/debugobjects.c	2011-07-13 17:23:19.000000000 -0400
 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
@@ -66454,9 +69211,9 @@ diff -urNp linux-2.6.32.45/lib/debugobjects.c linux-2.6.32.45/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-2.6.32.45/lib/dma-debug.c linux-2.6.32.45/lib/dma-debug.c
---- linux-2.6.32.45/lib/dma-debug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/dma-debug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/dma-debug.c linux-2.6.32.46/lib/dma-debug.c
+--- linux-2.6.32.46/lib/dma-debug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/dma-debug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -861,7 +861,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -66466,9 +69223,9 @@ diff -urNp linux-2.6.32.45/lib/dma-debug.c linux-2.6.32.45/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-2.6.32.45/lib/idr.c linux-2.6.32.45/lib/idr.c
---- linux-2.6.32.45/lib/idr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/idr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/idr.c linux-2.6.32.46/lib/idr.c
+--- linux-2.6.32.46/lib/idr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/idr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
  			id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
  
@@ -66478,9 +69235,9 @@ diff -urNp linux-2.6.32.45/lib/idr.c linux-2.6.32.45/lib/idr.c
  				*starting_id = id;
  				return IDR_NEED_TO_GROW;
  			}
-diff -urNp linux-2.6.32.45/lib/inflate.c linux-2.6.32.45/lib/inflate.c
---- linux-2.6.32.45/lib/inflate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/inflate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/inflate.c linux-2.6.32.46/lib/inflate.c
+--- linux-2.6.32.46/lib/inflate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/inflate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -266,7 +266,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -66490,9 +69247,9 @@ diff -urNp linux-2.6.32.45/lib/inflate.c linux-2.6.32.45/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.32.45/lib/Kconfig.debug linux-2.6.32.45/lib/Kconfig.debug
---- linux-2.6.32.45/lib/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/Kconfig.debug linux-2.6.32.46/lib/Kconfig.debug
+--- linux-2.6.32.46/lib/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
 @@ -905,7 +905,7 @@ config LATENCYTOP
  	select STACKTRACE
  	select SCHEDSTATS
@@ -66502,9 +69259,9 @@ diff -urNp linux-2.6.32.45/lib/Kconfig.debug linux-2.6.32.45/lib/Kconfig.debug
  	help
  	  Enable this option if you want to use the LatencyTOP tool
  	  to find out which userspace is blocking on what kernel operations.
-diff -urNp linux-2.6.32.45/lib/kobject.c linux-2.6.32.45/lib/kobject.c
---- linux-2.6.32.45/lib/kobject.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/kobject.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/kobject.c linux-2.6.32.46/lib/kobject.c
+--- linux-2.6.32.46/lib/kobject.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/kobject.c	2011-04-17 15:56:46.000000000 -0400
 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
  	return ret;
  }
@@ -66532,9 +69289,9 @@ diff -urNp linux-2.6.32.45/lib/kobject.c linux-2.6.32.45/lib/kobject.c
  				 struct kobject *parent_kobj)
  {
  	struct kset *kset;
-diff -urNp linux-2.6.32.45/lib/kobject_uevent.c linux-2.6.32.45/lib/kobject_uevent.c
---- linux-2.6.32.45/lib/kobject_uevent.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/kobject_uevent.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/kobject_uevent.c linux-2.6.32.46/lib/kobject_uevent.c
+--- linux-2.6.32.46/lib/kobject_uevent.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/kobject_uevent.c	2011-04-17 15:56:46.000000000 -0400
 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
  	const char *subsystem;
  	struct kobject *top_kobj;
@@ -66544,9 +69301,9 @@ diff -urNp linux-2.6.32.45/lib/kobject_uevent.c linux-2.6.32.45/lib/kobject_ueve
  	u64 seq;
  	int i = 0;
  	int retval = 0;
-diff -urNp linux-2.6.32.45/lib/kref.c linux-2.6.32.45/lib/kref.c
---- linux-2.6.32.45/lib/kref.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/kref.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/kref.c linux-2.6.32.46/lib/kref.c
+--- linux-2.6.32.46/lib/kref.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/kref.c	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -66556,9 +69313,9 @@ diff -urNp linux-2.6.32.45/lib/kref.c linux-2.6.32.45/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-2.6.32.45/lib/parser.c linux-2.6.32.45/lib/parser.c
---- linux-2.6.32.45/lib/parser.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/parser.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/parser.c linux-2.6.32.46/lib/parser.c
+--- linux-2.6.32.46/lib/parser.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/parser.c	2011-04-17 15:56:46.000000000 -0400
 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, 
  	char *buf;
  	int ret;
@@ -66568,9 +69325,9 @@ diff -urNp linux-2.6.32.45/lib/parser.c linux-2.6.32.45/lib/parser.c
  	if (!buf)
  		return -ENOMEM;
  	memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.32.45/lib/radix-tree.c linux-2.6.32.45/lib/radix-tree.c
---- linux-2.6.32.45/lib/radix-tree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/radix-tree.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/radix-tree.c linux-2.6.32.46/lib/radix-tree.c
+--- linux-2.6.32.46/lib/radix-tree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/radix-tree.c	2011-04-17 15:56:46.000000000 -0400
 @@ -81,7 +81,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -66580,9 +69337,9 @@ diff -urNp linux-2.6.32.45/lib/radix-tree.c linux-2.6.32.45/lib/radix-tree.c
  
  static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
  {
-diff -urNp linux-2.6.32.45/lib/random32.c linux-2.6.32.45/lib/random32.c
---- linux-2.6.32.45/lib/random32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/random32.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/random32.c linux-2.6.32.46/lib/random32.c
+--- linux-2.6.32.46/lib/random32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/random32.c	2011-04-17 15:56:46.000000000 -0400
 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
   */
  static inline u32 __seed(u32 x, u32 m)
@@ -66592,9 +69349,9 @@ diff -urNp linux-2.6.32.45/lib/random32.c linux-2.6.32.45/lib/random32.c
  }
  
  /**
-diff -urNp linux-2.6.32.45/lib/vsprintf.c linux-2.6.32.45/lib/vsprintf.c
---- linux-2.6.32.45/lib/vsprintf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/lib/vsprintf.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/lib/vsprintf.c linux-2.6.32.46/lib/vsprintf.c
+--- linux-2.6.32.46/lib/vsprintf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/vsprintf.c	2011-04-17 15:56:46.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -66695,14 +69452,14 @@ diff -urNp linux-2.6.32.45/lib/vsprintf.c linux-2.6.32.45/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-2.6.32.45/localversion-grsec linux-2.6.32.45/localversion-grsec
---- linux-2.6.32.45/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/localversion-grsec	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/localversion-grsec linux-2.6.32.46/localversion-grsec
+--- linux-2.6.32.46/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/localversion-grsec	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
---- linux-2.6.32.45/Makefile	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/Makefile	2011-08-26 22:53:29.000000000 -0400
+diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.46/Makefile
+--- linux-2.6.32.46/Makefile	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/Makefile	2011-08-30 18:21:35.000000000 -0400
 @@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -66728,20 +69485,7 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  KBUILD_AFLAGS   := -D__ASSEMBLY__
  
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
-@@ -376,9 +379,10 @@ export RCS_TAR_IGNORE := --exclude SCCS 
- # Rules shared between *config targets and build targets
- 
- # Basic helpers built in scripts/
--PHONY += scripts_basic
--scripts_basic:
-+PHONY += scripts_basic0 scripts_basic gcc-plugins
-+scripts_basic0:
- 	$(Q)$(MAKE) $(build)=scripts/basic
-+scripts_basic: scripts_basic0 gcc-plugins
- 
- # To avoid any implicit rule to kick in, define an empty command.
- scripts/basic/%: scripts_basic ;
-@@ -403,7 +407,7 @@ endif
+@@ -403,7 +406,7 @@ endif
  # of make so .config is not included in this case either (for *config).
  
  no-dot-config-targets := clean mrproper distclean \
@@ -66750,7 +69494,7 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  			 include/linux/version.h headers_% \
  			 kernelrelease kernelversion
  
-@@ -526,6 +530,24 @@ else
+@@ -526,6 +529,24 @@ else
  KBUILD_CFLAGS	+= -O2
  endif
  
@@ -66760,7 +69504,7 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
 +STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
 +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
-+gcc-plugins:
++gcc-plugins: prepare
 +	$(Q)$(MAKE) $(build)=tools/gcc
 +else
 +gcc-plugins:
@@ -66775,7 +69519,7 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  include $(srctree)/arch/$(SRCARCH)/Makefile
  
  ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -644,7 +666,7 @@ export mod_strip_cmd
+@@ -644,7 +665,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -66784,31 +69528,52 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -840,6 +862,7 @@ define rule_vmlinux-modpost
+@@ -840,6 +861,8 @@ define rule_vmlinux-modpost
  endef
  
  # vmlinux image - including updated kernel symbols
-+vmlinux: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-all): KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-all): gcc-plugins
  vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
  ifdef CONFIG_HEADERS_CHECK
  	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
-@@ -970,7 +993,7 @@ ifneq ($(KBUILD_SRC),)
- endif
+@@ -865,7 +888,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
+ 
+ # The actual objects are generated when descending, 
+ # make sure no implicit rule kicks in
+-$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): prepare scripts $(vmlinux-dirs) ;
  
- # prepare2 creates a makefile if using a separate output directory
--prepare2: prepare3 outputmakefile
-+prepare2: prepare3 outputmakefile gcc-plugins
+ # Handle descending into subdirectories listed in $(vmlinux-dirs)
+ # Preset locale variables to speed up the build process. Limit locale
+@@ -874,7 +897,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
+ # Error messages still appears in the original language
  
- prepare1: prepare2 include/linux/version.h include/linux/utsrelease.h \
-                    include/asm include/config/auto.conf
-@@ -1124,6 +1147,7 @@ all: modules
+ PHONY += $(vmlinux-dirs)
+-$(vmlinux-dirs): prepare scripts
++$(vmlinux-dirs): gcc-plugins
+ 	$(Q)$(MAKE) $(build)=$@
+ 
+ # Build the kernel release string
+@@ -1124,7 +1147,8 @@ all: modules
  #	using awk while concatenating to the final file.
  
  PHONY += modules
-+modules: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
+-modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
++$(vmlinux-dirs): KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++modules: prepare scripts $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
  	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
  	@$(kecho) '  Building modules, stage 2.';
+ 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
+@@ -1133,7 +1157,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_B
+ 
+ # Target to prepare building external modules
+ PHONY += modules_prepare
+-modules_prepare: prepare scripts
++modules_prepare: gcc-plugins prepare scripts
+ 
+ # Target to install modules
+ PHONY += modules_install
 @@ -1198,7 +1222,7 @@ MRPROPER_FILES += .config .config.old in
                    include/linux/autoconf.h include/linux/version.h      \
                    include/linux/utsrelease.h                            \
@@ -66818,6 +69583,15 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  
  # clean - Delete most, but leave enough to build external modules
  #
+@@ -1242,7 +1266,7 @@ distclean: mrproper
+ 	@find $(srctree) $(RCS_FIND_IGNORE) \
+ 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+ 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
+-		-o -name '.*.rej' -o -size 0 \
++		-o -name '.*.rej' -o -name '*.so' -o -size 0 \
+ 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+ 		-type f -print | xargs rm -f
+ 
 @@ -1289,6 +1313,7 @@ help:
  	@echo  '  modules_prepare - Set up for building external modules'
  	@echo  '  tags/TAGS	  - Generate tags file for editors'
@@ -66834,15 +69608,6 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  modules: $(module-dirs)
  	@$(kecho) '  Building modules, stage 2.';
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1421,7 +1447,7 @@ clean: $(clean-dirs)
- 	$(call cmd,rmdirs)
- 	$(call cmd,rmfiles)
- 	@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \
--		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-+		\( -name '*.[oas]' -o -name '*.[ks]o' -o -name '.*.cmd' \
- 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
- 		-o -name '*.gcno' \) -type f -print | xargs rm -f
- 
 @@ -1445,7 +1471,7 @@ endif # KBUILD_EXTMOD
  quiet_cmd_tags = GEN     $@
        cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
@@ -66852,9 +69617,26 @@ diff -urNp linux-2.6.32.45/Makefile linux-2.6.32.45/Makefile
  	$(call cmd,tags)
  
  # Scripts to check various things for consistency
-diff -urNp linux-2.6.32.45/mm/backing-dev.c linux-2.6.32.45/mm/backing-dev.c
---- linux-2.6.32.45/mm/backing-dev.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/backing-dev.c	2011-08-11 19:48:17.000000000 -0400
+@@ -1514,13 +1540,14 @@ endif
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.i: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.c prepare scripts FORCE
++%.o: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++%.o: %.c gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.lst: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.s: %.S prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.S prepare scripts FORCE
++%.o: %.S gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.symtypes: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+diff -urNp linux-2.6.32.46/mm/backing-dev.c linux-2.6.32.46/mm/backing-dev.c
+--- linux-2.6.32.46/mm/backing-dev.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/backing-dev.c	2011-08-11 19:48:17.000000000 -0400
 @@ -272,7 +272,7 @@ static void bdi_task_init(struct backing
  	list_add_tail_rcu(&wb->list, &bdi->wb_list);
  	spin_unlock(&bdi->wb_lock);
@@ -66873,9 +69655,9 @@ diff -urNp linux-2.6.32.45/mm/backing-dev.c linux-2.6.32.45/mm/backing-dev.c
  {
  	if (!bdi_cap_writeback_dirty(bdi))
  		return;
-diff -urNp linux-2.6.32.45/mm/filemap.c linux-2.6.32.45/mm/filemap.c
---- linux-2.6.32.45/mm/filemap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/filemap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/filemap.c linux-2.6.32.46/mm/filemap.c
+--- linux-2.6.32.46/mm/filemap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/filemap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
@@ -66893,9 +69675,9 @@ diff -urNp linux-2.6.32.45/mm/filemap.c linux-2.6.32.45/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-2.6.32.45/mm/fremap.c linux-2.6.32.45/mm/fremap.c
---- linux-2.6.32.45/mm/fremap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/fremap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/fremap.c linux-2.6.32.46/mm/fremap.c
+--- linux-2.6.32.46/mm/fremap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/fremap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
@@ -66917,9 +69699,9 @@ diff -urNp linux-2.6.32.45/mm/fremap.c linux-2.6.32.45/mm/fremap.c
  		munlock_vma_pages_range(vma, start, start + size);
  		vma->vm_flags = saved_flags;
  	}
-diff -urNp linux-2.6.32.45/mm/highmem.c linux-2.6.32.45/mm/highmem.c
---- linux-2.6.32.45/mm/highmem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/highmem.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/highmem.c linux-2.6.32.46/mm/highmem.c
+--- linux-2.6.32.46/mm/highmem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/highmem.c	2011-04-17 15:56:46.000000000 -0400
 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -66945,9 +69727,9 @@ diff -urNp linux-2.6.32.45/mm/highmem.c linux-2.6.32.45/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-2.6.32.45/mm/hugetlb.c linux-2.6.32.45/mm/hugetlb.c
---- linux-2.6.32.45/mm/hugetlb.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/mm/hugetlb.c	2011-07-13 17:23:19.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/hugetlb.c linux-2.6.32.46/mm/hugetlb.c
+--- linux-2.6.32.46/mm/hugetlb.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/mm/hugetlb.c	2011-07-13 17:23:19.000000000 -0400
 @@ -1933,6 +1933,26 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
@@ -67027,9 +69809,9 @@ diff -urNp linux-2.6.32.45/mm/hugetlb.c linux-2.6.32.45/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-2.6.32.45/mm/internal.h linux-2.6.32.45/mm/internal.h
---- linux-2.6.32.45/mm/internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/internal.h	2011-07-09 09:13:08.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/internal.h linux-2.6.32.46/mm/internal.h
+--- linux-2.6.32.46/mm/internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/internal.h	2011-07-09 09:13:08.000000000 -0400
 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
   * in mm/page_alloc.c
   */
@@ -67038,9 +69820,9 @@ diff -urNp linux-2.6.32.45/mm/internal.h linux-2.6.32.45/mm/internal.h
  extern void prep_compound_page(struct page *page, unsigned long order);
  
  
-diff -urNp linux-2.6.32.45/mm/Kconfig linux-2.6.32.45/mm/Kconfig
---- linux-2.6.32.45/mm/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/Kconfig linux-2.6.32.46/mm/Kconfig
+--- linux-2.6.32.46/mm/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -228,7 +228,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -67050,9 +69832,9 @@ diff -urNp linux-2.6.32.45/mm/Kconfig linux-2.6.32.45/mm/Kconfig
          help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.32.45/mm/kmemleak.c linux-2.6.32.45/mm/kmemleak.c
---- linux-2.6.32.45/mm/kmemleak.c	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/mm/kmemleak.c	2011-06-25 12:56:37.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/kmemleak.c linux-2.6.32.46/mm/kmemleak.c
+--- linux-2.6.32.46/mm/kmemleak.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/mm/kmemleak.c	2011-06-25 12:56:37.000000000 -0400
 @@ -358,7 +358,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
@@ -67062,9 +69844,9 @@ diff -urNp linux-2.6.32.45/mm/kmemleak.c linux-2.6.32.45/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-2.6.32.45/mm/maccess.c linux-2.6.32.45/mm/maccess.c
---- linux-2.6.32.45/mm/maccess.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/maccess.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/maccess.c linux-2.6.32.46/mm/maccess.c
+--- linux-2.6.32.46/mm/maccess.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/maccess.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,7 +14,7 @@
   * Safely read from address @src to the buffer at @dst.  If a kernel fault
   * happens, handle that and return -EFAULT.
@@ -67083,9 +69865,9 @@ diff -urNp linux-2.6.32.45/mm/maccess.c linux-2.6.32.45/mm/maccess.c
  {
  	long ret;
  	mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.32.45/mm/madvise.c linux-2.6.32.45/mm/madvise.c
---- linux-2.6.32.45/mm/madvise.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/madvise.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/madvise.c linux-2.6.32.46/mm/madvise.c
+--- linux-2.6.32.46/mm/madvise.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/madvise.c	2011-04-17 15:56:46.000000000 -0400
 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
@@ -67162,9 +69944,9 @@ diff -urNp linux-2.6.32.45/mm/madvise.c linux-2.6.32.45/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-2.6.32.45/mm/memory.c linux-2.6.32.45/mm/memory.c
---- linux-2.6.32.45/mm/memory.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/mm/memory.c	2011-07-13 17:23:23.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/memory.c linux-2.6.32.46/mm/memory.c
+--- linux-2.6.32.46/mm/memory.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/mm/memory.c	2011-07-13 17:23:23.000000000 -0400
 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -67694,9 +70476,9 @@ diff -urNp linux-2.6.32.45/mm/memory.c linux-2.6.32.45/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.32.45/mm/memory-failure.c linux-2.6.32.45/mm/memory-failure.c
---- linux-2.6.32.45/mm/memory-failure.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/memory-failure.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/memory-failure.c linux-2.6.32.46/mm/memory-failure.c
+--- linux-2.6.32.46/mm/memory-failure.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/memory-failure.c	2011-04-17 15:56:46.000000000 -0400
 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -67715,9 +70497,9 @@ diff -urNp linux-2.6.32.45/mm/memory-failure.c linux-2.6.32.45/mm/memory-failure
  
  	/*
  	 * We need/can do nothing about count=0 pages.
-diff -urNp linux-2.6.32.45/mm/mempolicy.c linux-2.6.32.45/mm/mempolicy.c
---- linux-2.6.32.45/mm/mempolicy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/mempolicy.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/mempolicy.c linux-2.6.32.46/mm/mempolicy.c
+--- linux-2.6.32.46/mm/mempolicy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/mempolicy.c	2011-04-17 15:56:46.000000000 -0400
 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
  	struct vm_area_struct *next;
  	int err;
@@ -67798,9 +70580,9 @@ diff -urNp linux-2.6.32.45/mm/mempolicy.c linux-2.6.32.45/mm/mempolicy.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.32.45/mm/migrate.c linux-2.6.32.45/mm/migrate.c
---- linux-2.6.32.45/mm/migrate.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/mm/migrate.c	2011-07-13 17:23:23.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/migrate.c linux-2.6.32.46/mm/migrate.c
+--- linux-2.6.32.46/mm/migrate.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/mm/migrate.c	2011-07-13 17:23:23.000000000 -0400
 @@ -916,6 +916,8 @@ static int do_pages_move(struct mm_struc
  	unsigned long chunk_start;
  	int err;
@@ -67835,9 +70617,9 @@ diff -urNp linux-2.6.32.45/mm/migrate.c linux-2.6.32.45/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-2.6.32.45/mm/mlock.c linux-2.6.32.45/mm/mlock.c
---- linux-2.6.32.45/mm/mlock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/mlock.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/mlock.c linux-2.6.32.46/mm/mlock.c
+--- linux-2.6.32.46/mm/mlock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/mlock.c	2011-04-17 15:56:46.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -67948,9 +70730,9 @@ diff -urNp linux-2.6.32.45/mm/mlock.c linux-2.6.32.45/mm/mlock.c
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-2.6.32.45/mm/mmap.c linux-2.6.32.45/mm/mmap.c
---- linux-2.6.32.45/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/mmap.c linux-2.6.32.46/mm/mmap.c
+--- linux-2.6.32.46/mm/mmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/mmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -45,6 +45,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -69167,9 +71949,9 @@ diff -urNp linux-2.6.32.45/mm/mmap.c linux-2.6.32.45/mm/mmap.c
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-2.6.32.45/mm/mprotect.c linux-2.6.32.45/mm/mprotect.c
---- linux-2.6.32.45/mm/mprotect.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/mprotect.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/mprotect.c linux-2.6.32.46/mm/mprotect.c
+--- linux-2.6.32.46/mm/mprotect.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/mprotect.c	2011-04-17 15:56:46.000000000 -0400
 @@ -24,10 +24,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -69392,9 +72174,9 @@ diff -urNp linux-2.6.32.45/mm/mprotect.c linux-2.6.32.45/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-2.6.32.45/mm/mremap.c linux-2.6.32.45/mm/mremap.c
---- linux-2.6.32.45/mm/mremap.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/mm/mremap.c	2011-04-17 17:03:58.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/mremap.c linux-2.6.32.46/mm/mremap.c
+--- linux-2.6.32.46/mm/mremap.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/mm/mremap.c	2011-04-17 17:03:58.000000000 -0400
 @@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -69499,9 +72281,9 @@ diff -urNp linux-2.6.32.45/mm/mremap.c linux-2.6.32.45/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.32.45/mm/nommu.c linux-2.6.32.45/mm/nommu.c
---- linux-2.6.32.45/mm/nommu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/nommu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/nommu.c linux-2.6.32.46/mm/nommu.c
+--- linux-2.6.32.46/mm/nommu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/nommu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -69526,9 +72308,9 @@ diff -urNp linux-2.6.32.45/mm/nommu.c linux-2.6.32.45/mm/nommu.c
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-diff -urNp linux-2.6.32.45/mm/page_alloc.c linux-2.6.32.45/mm/page_alloc.c
---- linux-2.6.32.45/mm/page_alloc.c	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/mm/page_alloc.c	2011-07-09 09:13:08.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/page_alloc.c linux-2.6.32.46/mm/page_alloc.c
+--- linux-2.6.32.46/mm/page_alloc.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/mm/page_alloc.c	2011-07-09 09:13:08.000000000 -0400
 @@ -289,7 +289,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -69603,9 +72385,9 @@ diff -urNp linux-2.6.32.45/mm/page_alloc.c linux-2.6.32.45/mm/page_alloc.c
  				struct zone *zone, unsigned long zonesize) {}
  #endif /* CONFIG_SPARSEMEM */
  
-diff -urNp linux-2.6.32.45/mm/percpu.c linux-2.6.32.45/mm/percpu.c
---- linux-2.6.32.45/mm/percpu.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/percpu.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/percpu.c linux-2.6.32.46/mm/percpu.c
+--- linux-2.6.32.46/mm/percpu.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/percpu.c	2011-04-17 15:56:46.000000000 -0400
 @@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -69615,9 +72397,9 @@ diff -urNp linux-2.6.32.45/mm/percpu.c linux-2.6.32.45/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-2.6.32.45/mm/rmap.c linux-2.6.32.45/mm/rmap.c
---- linux-2.6.32.45/mm/rmap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/rmap.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/rmap.c linux-2.6.32.46/mm/rmap.c
+--- linux-2.6.32.46/mm/rmap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/rmap.c	2011-04-17 15:56:46.000000000 -0400
 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
  		/* page_table_lock to protect against threads */
  		spin_lock(&mm->page_table_lock);
@@ -69636,9 +72418,9 @@ diff -urNp linux-2.6.32.45/mm/rmap.c linux-2.6.32.45/mm/rmap.c
  			vma->anon_vma = anon_vma;
  			list_add_tail(&vma->anon_vma_node, &anon_vma->head);
  			allocated = NULL;
-diff -urNp linux-2.6.32.45/mm/shmem.c linux-2.6.32.45/mm/shmem.c
---- linux-2.6.32.45/mm/shmem.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/shmem.c	2011-05-18 20:09:37.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/shmem.c linux-2.6.32.46/mm/shmem.c
+--- linux-2.6.32.46/mm/shmem.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/shmem.c	2011-05-18 20:09:37.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/swap.h>
  #include <linux/ima.h>
@@ -69685,9 +72467,9 @@ diff -urNp linux-2.6.32.45/mm/shmem.c linux-2.6.32.45/mm/shmem.c
  	if (!sbinfo)
  		return -ENOMEM;
  
-diff -urNp linux-2.6.32.45/mm/slab.c linux-2.6.32.45/mm/slab.c
---- linux-2.6.32.45/mm/slab.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/slab.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/slab.c linux-2.6.32.46/mm/slab.c
+--- linux-2.6.32.46/mm/slab.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/slab.c	2011-05-04 17:56:20.000000000 -0400
 @@ -174,7 +174,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -69850,9 +72632,9 @@ diff -urNp linux-2.6.32.45/mm/slab.c linux-2.6.32.45/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-2.6.32.45/mm/slob.c linux-2.6.32.45/mm/slob.c
---- linux-2.6.32.45/mm/slob.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/slob.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/slob.c linux-2.6.32.46/mm/slob.c
+--- linux-2.6.32.46/mm/slob.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/slob.c	2011-07-06 19:53:33.000000000 -0400
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -70202,9 +72984,9 @@ diff -urNp linux-2.6.32.45/mm/slob.c linux-2.6.32.45/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-2.6.32.45/mm/slub.c linux-2.6.32.45/mm/slub.c
---- linux-2.6.32.45/mm/slub.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/slub.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/slub.c linux-2.6.32.46/mm/slub.c
+--- linux-2.6.32.46/mm/slub.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/slub.c	2011-04-17 15:56:46.000000000 -0400
 @@ -410,7 +410,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
@@ -70415,9 +73197,9 @@ diff -urNp linux-2.6.32.45/mm/slub.c linux-2.6.32.45/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-2.6.32.45/mm/swap.c linux-2.6.32.45/mm/swap.c
---- linux-2.6.32.45/mm/swap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/swap.c	2011-07-09 09:15:19.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/swap.c linux-2.6.32.46/mm/swap.c
+--- linux-2.6.32.46/mm/swap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/swap.c	2011-07-09 09:15:19.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/notifier.h>
  #include <linux/backing-dev.h>
@@ -70435,9 +73217,9 @@ diff -urNp linux-2.6.32.45/mm/swap.c linux-2.6.32.45/mm/swap.c
  		(*dtor)(page);
  	}
  }
-diff -urNp linux-2.6.32.45/mm/util.c linux-2.6.32.45/mm/util.c
---- linux-2.6.32.45/mm/util.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/util.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/util.c linux-2.6.32.46/mm/util.c
+--- linux-2.6.32.46/mm/util.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/util.c	2011-04-17 15:56:46.000000000 -0400
 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
@@ -70451,9 +73233,9 @@ diff -urNp linux-2.6.32.45/mm/util.c linux-2.6.32.45/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
---- linux-2.6.32.45/mm/vmalloc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/vmalloc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/vmalloc.c linux-2.6.32.46/mm/vmalloc.c
+--- linux-2.6.32.46/mm/vmalloc.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/mm/vmalloc.c	2011-08-29 22:25:07.000000000 -0400
 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -70577,7 +73359,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  			p = &(*p)->rb_right;
  		else
  			BUG();
-@@ -1232,6 +1274,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -1233,6 +1275,16 @@ static struct vm_struct *__get_vm_area_n
  	struct vm_struct *area;
  
  	BUG_ON(in_interrupt());
@@ -70594,7 +73376,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  	if (flags & VM_IOREMAP) {
  		int bit = fls(size);
  
-@@ -1457,6 +1509,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1458,6 +1510,11 @@ void *vmap(struct page **pages, unsigned
  	if (count > totalram_pages)
  		return NULL;
  
@@ -70606,7 +73388,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  	area = get_vm_area_caller((count << PAGE_SHIFT), flags,
  					__builtin_return_address(0));
  	if (!area)
-@@ -1567,6 +1624,13 @@ static void *__vmalloc_node(unsigned lon
+@@ -1568,6 +1625,13 @@ static void *__vmalloc_node(unsigned lon
  	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
  		return NULL;
  
@@ -70620,7 +73402,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  	area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START,
  				  VMALLOC_END, node, gfp_mask, caller);
  
-@@ -1585,6 +1649,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1586,6 +1650,7 @@ static void *__vmalloc_node(unsigned lon
  	return addr;
  }
  
@@ -70628,7 +73410,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
  	return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1601,6 +1666,7 @@ EXPORT_SYMBOL(__vmalloc);
+@@ -1602,6 +1667,7 @@ EXPORT_SYMBOL(__vmalloc);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -70636,7 +73418,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  void *vmalloc(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1615,6 +1681,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1616,6 +1682,7 @@ EXPORT_SYMBOL(vmalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -70644,7 +73426,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  void *vmalloc_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -1642,6 +1709,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1643,6 +1710,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -70652,7 +73434,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  void *vmalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1664,10 +1732,10 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1665,10 +1733,10 @@ EXPORT_SYMBOL(vmalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -70665,7 +73447,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  			      -1, __builtin_return_address(0));
  }
  
-@@ -1686,6 +1754,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1687,6 +1755,7 @@ void *vmalloc_exec(unsigned long size)
   *	Allocate enough 32bit PA addressable pages to cover @size from the
   *	page level allocator and map them into contiguous kernel virtual space.
   */
@@ -70673,7 +73455,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  void *vmalloc_32(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1700,6 +1769,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1701,6 +1770,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -70681,7 +73463,7 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  void *vmalloc_32_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -1964,6 +2034,8 @@ int remap_vmalloc_range(struct vm_area_s
+@@ -1965,6 +2035,8 @@ int remap_vmalloc_range(struct vm_area_s
  	unsigned long uaddr = vma->vm_start;
  	unsigned long usize = vma->vm_end - vma->vm_start;
  
@@ -70690,9 +73472,9 @@ diff -urNp linux-2.6.32.45/mm/vmalloc.c linux-2.6.32.45/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.45/mm/vmstat.c linux-2.6.32.45/mm/vmstat.c
---- linux-2.6.32.45/mm/vmstat.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/mm/vmstat.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/mm/vmstat.c linux-2.6.32.46/mm/vmstat.c
+--- linux-2.6.32.46/mm/vmstat.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/vmstat.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -70745,9 +73527,9 @@ diff -urNp linux-2.6.32.45/mm/vmstat.c linux-2.6.32.45/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-2.6.32.45/net/8021q/vlan.c linux-2.6.32.45/net/8021q/vlan.c
---- linux-2.6.32.45/net/8021q/vlan.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/8021q/vlan.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/8021q/vlan.c linux-2.6.32.46/net/8021q/vlan.c
+--- linux-2.6.32.46/net/8021q/vlan.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/8021q/vlan.c	2011-04-17 15:56:46.000000000 -0400
 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
@@ -70758,9 +73540,9 @@ diff -urNp linux-2.6.32.45/net/8021q/vlan.c linux-2.6.32.45/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-2.6.32.45/net/atm/atm_misc.c linux-2.6.32.45/net/atm/atm_misc.c
---- linux-2.6.32.45/net/atm/atm_misc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/atm/atm_misc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/atm/atm_misc.c linux-2.6.32.46/net/atm/atm_misc.c
+--- linux-2.6.32.46/net/atm/atm_misc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/atm/atm_misc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
@@ -70797,9 +73579,9 @@ diff -urNp linux-2.6.32.45/net/atm/atm_misc.c linux-2.6.32.45/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.32.45/net/atm/lec.h linux-2.6.32.45/net/atm/lec.h
---- linux-2.6.32.45/net/atm/lec.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/atm/lec.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/net/atm/lec.h linux-2.6.32.46/net/atm/lec.h
+--- linux-2.6.32.46/net/atm/lec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/atm/lec.h	2011-08-05 20:33:55.000000000 -0400
 @@ -48,7 +48,7 @@ struct lane2_ops {
  			      const u8 *tlvs, u32 sizeoftlvs);
  	void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -70809,9 +73591,9 @@ diff -urNp linux-2.6.32.45/net/atm/lec.h linux-2.6.32.45/net/atm/lec.h
  
  /*
   * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-2.6.32.45/net/atm/mpc.h linux-2.6.32.45/net/atm/mpc.h
---- linux-2.6.32.45/net/atm/mpc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/atm/mpc.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/net/atm/mpc.h linux-2.6.32.46/net/atm/mpc.h
+--- linux-2.6.32.46/net/atm/mpc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/atm/mpc.h	2011-08-23 21:22:38.000000000 -0400
 @@ -33,7 +33,7 @@ struct mpoa_client {
  	struct mpc_parameters parameters;  /* parameters for this client    */
  
@@ -70821,9 +73603,9 @@ diff -urNp linux-2.6.32.45/net/atm/mpc.h linux-2.6.32.45/net/atm/mpc.h
  };
  
  
-diff -urNp linux-2.6.32.45/net/atm/mpoa_caches.c linux-2.6.32.45/net/atm/mpoa_caches.c
---- linux-2.6.32.45/net/atm/mpoa_caches.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/atm/mpoa_caches.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/atm/mpoa_caches.c linux-2.6.32.46/net/atm/mpoa_caches.c
+--- linux-2.6.32.46/net/atm/mpoa_caches.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/atm/mpoa_caches.c	2011-05-16 21:46:57.000000000 -0400
 @@ -498,6 +498,8 @@ static void clear_expired(struct mpoa_cl
  	struct timeval now;
  	struct k_message msg;
@@ -70833,9 +73615,9 @@ diff -urNp linux-2.6.32.45/net/atm/mpoa_caches.c linux-2.6.32.45/net/atm/mpoa_ca
  	do_gettimeofday(&now);
  
  	write_lock_irq(&client->egress_lock);
-diff -urNp linux-2.6.32.45/net/atm/proc.c linux-2.6.32.45/net/atm/proc.c
---- linux-2.6.32.45/net/atm/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/atm/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/atm/proc.c linux-2.6.32.46/net/atm/proc.c
+--- linux-2.6.32.46/net/atm/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/atm/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -70874,9 +73656,9 @@ diff -urNp linux-2.6.32.45/net/atm/proc.c linux-2.6.32.45/net/atm/proc.c
  	else
  		seq_printf(seq, "%3d %3d %5d         ",
  			   vcc->dev->number, vcc->vpi, vcc->vci);
-diff -urNp linux-2.6.32.45/net/atm/resources.c linux-2.6.32.45/net/atm/resources.c
---- linux-2.6.32.45/net/atm/resources.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/atm/resources.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/atm/resources.c linux-2.6.32.46/net/atm/resources.c
+--- linux-2.6.32.46/net/atm/resources.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/atm/resources.c	2011-04-17 15:56:46.000000000 -0400
 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
@@ -70895,9 +73677,9 @@ diff -urNp linux-2.6.32.45/net/atm/resources.c linux-2.6.32.45/net/atm/resources
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-2.6.32.45/net/bluetooth/l2cap.c linux-2.6.32.45/net/bluetooth/l2cap.c
---- linux-2.6.32.45/net/bluetooth/l2cap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/bluetooth/l2cap.c	2011-06-25 14:36:21.000000000 -0400
+diff -urNp linux-2.6.32.46/net/bluetooth/l2cap.c linux-2.6.32.46/net/bluetooth/l2cap.c
+--- linux-2.6.32.46/net/bluetooth/l2cap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/bluetooth/l2cap.c	2011-06-25 14:36:21.000000000 -0400
 @@ -1885,7 +1885,7 @@ static int l2cap_sock_getsockopt_old(str
  			err = -ENOTCONN;
  			break;
@@ -70916,9 +73698,9 @@ diff -urNp linux-2.6.32.45/net/bluetooth/l2cap.c linux-2.6.32.45/net/bluetooth/l
  		l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
  				l2cap_build_conf_rsp(sk, rsp,
  					L2CAP_CONF_REJECT, flags), rsp);
-diff -urNp linux-2.6.32.45/net/bluetooth/rfcomm/sock.c linux-2.6.32.45/net/bluetooth/rfcomm/sock.c
---- linux-2.6.32.45/net/bluetooth/rfcomm/sock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/bluetooth/rfcomm/sock.c	2011-06-12 06:35:00.000000000 -0400
+diff -urNp linux-2.6.32.46/net/bluetooth/rfcomm/sock.c linux-2.6.32.46/net/bluetooth/rfcomm/sock.c
+--- linux-2.6.32.46/net/bluetooth/rfcomm/sock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/bluetooth/rfcomm/sock.c	2011-06-12 06:35:00.000000000 -0400
 @@ -878,6 +878,7 @@ static int rfcomm_sock_getsockopt_old(st
  
  		l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk;
@@ -70927,9 +73709,9 @@ diff -urNp linux-2.6.32.45/net/bluetooth/rfcomm/sock.c linux-2.6.32.45/net/bluet
  		cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle;
  		memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3);
  
-diff -urNp linux-2.6.32.45/net/bridge/br_private.h linux-2.6.32.45/net/bridge/br_private.h
---- linux-2.6.32.45/net/bridge/br_private.h	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/net/bridge/br_private.h	2011-08-09 18:34:01.000000000 -0400
+diff -urNp linux-2.6.32.46/net/bridge/br_private.h linux-2.6.32.46/net/bridge/br_private.h
+--- linux-2.6.32.46/net/bridge/br_private.h	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/net/bridge/br_private.h	2011-08-09 18:34:01.000000000 -0400
 @@ -255,7 +255,7 @@ extern void br_ifinfo_notify(int event, 
  
  #ifdef CONFIG_SYSFS
@@ -70939,9 +73721,9 @@ diff -urNp linux-2.6.32.45/net/bridge/br_private.h linux-2.6.32.45/net/bridge/br
  extern int br_sysfs_addif(struct net_bridge_port *p);
  
  /* br_sysfs_br.c */
-diff -urNp linux-2.6.32.45/net/bridge/br_stp_if.c linux-2.6.32.45/net/bridge/br_stp_if.c
---- linux-2.6.32.45/net/bridge/br_stp_if.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/bridge/br_stp_if.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/bridge/br_stp_if.c linux-2.6.32.46/net/bridge/br_stp_if.c
+--- linux-2.6.32.46/net/bridge/br_stp_if.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/bridge/br_stp_if.c	2011-04-17 15:56:46.000000000 -0400
 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
  	char *envp[] = { NULL };
  
@@ -70951,9 +73733,9 @@ diff -urNp linux-2.6.32.45/net/bridge/br_stp_if.c linux-2.6.32.45/net/bridge/br_
  		printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
  			br->dev->name, r);
  
-diff -urNp linux-2.6.32.45/net/bridge/br_sysfs_if.c linux-2.6.32.45/net/bridge/br_sysfs_if.c
---- linux-2.6.32.45/net/bridge/br_sysfs_if.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/bridge/br_sysfs_if.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/bridge/br_sysfs_if.c linux-2.6.32.46/net/bridge/br_sysfs_if.c
+--- linux-2.6.32.46/net/bridge/br_sysfs_if.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/bridge/br_sysfs_if.c	2011-04-17 15:56:46.000000000 -0400
 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
  	return ret;
  }
@@ -70963,9 +73745,9 @@ diff -urNp linux-2.6.32.45/net/bridge/br_sysfs_if.c linux-2.6.32.45/net/bridge/b
  	.show = brport_show,
  	.store = brport_store,
  };
-diff -urNp linux-2.6.32.45/net/bridge/netfilter/ebtables.c linux-2.6.32.45/net/bridge/netfilter/ebtables.c
---- linux-2.6.32.45/net/bridge/netfilter/ebtables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/net/bridge/netfilter/ebtables.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/bridge/netfilter/ebtables.c linux-2.6.32.46/net/bridge/netfilter/ebtables.c
+--- linux-2.6.32.46/net/bridge/netfilter/ebtables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/net/bridge/netfilter/ebtables.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1337,6 +1337,8 @@ static int copy_everything_to_user(struc
  	unsigned int entries_size, nentries;
  	char *entries;
@@ -70975,9 +73757,9 @@ diff -urNp linux-2.6.32.45/net/bridge/netfilter/ebtables.c linux-2.6.32.45/net/b
  	if (cmd == EBT_SO_GET_ENTRIES) {
  		entries_size = t->private->entries_size;
  		nentries = t->private->nentries;
-diff -urNp linux-2.6.32.45/net/can/bcm.c linux-2.6.32.45/net/can/bcm.c
---- linux-2.6.32.45/net/can/bcm.c	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.45/net/can/bcm.c	2011-05-10 22:12:34.000000000 -0400
+diff -urNp linux-2.6.32.46/net/can/bcm.c linux-2.6.32.46/net/can/bcm.c
+--- linux-2.6.32.46/net/can/bcm.c	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/net/can/bcm.c	2011-05-10 22:12:34.000000000 -0400
 @@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file
  	struct bcm_sock *bo = bcm_sk(sk);
  	struct bcm_op *op;
@@ -70994,9 +73776,9 @@ diff -urNp linux-2.6.32.45/net/can/bcm.c linux-2.6.32.45/net/can/bcm.c
  	seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
  	seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
  	seq_printf(m, " <<<\n");
-diff -urNp linux-2.6.32.45/net/core/dev.c linux-2.6.32.45/net/core/dev.c
---- linux-2.6.32.45/net/core/dev.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/net/core/dev.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/net/core/dev.c linux-2.6.32.46/net/core/dev.c
+--- linux-2.6.32.46/net/core/dev.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/net/core/dev.c	2011-08-05 20:33:55.000000000 -0400
 @@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
@@ -71039,9 +73821,9 @@ diff -urNp linux-2.6.32.45/net/core/dev.c linux-2.6.32.45/net/core/dev.c
  {
  	struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-2.6.32.45/net/core/flow.c linux-2.6.32.45/net/core/flow.c
---- linux-2.6.32.45/net/core/flow.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/core/flow.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/net/core/flow.c linux-2.6.32.46/net/core/flow.c
+--- linux-2.6.32.46/net/core/flow.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/core/flow.c	2011-05-04 17:56:20.000000000 -0400
 @@ -35,11 +35,11 @@ struct flow_cache_entry {
  	atomic_t		*object_ref;
  };
@@ -71101,9 +73883,9 @@ diff -urNp linux-2.6.32.45/net/core/flow.c linux-2.6.32.45/net/core/flow.c
  
  			if (!fle->object || fle->genid == genid)
  				continue;
-diff -urNp linux-2.6.32.45/net/core/rtnetlink.c linux-2.6.32.45/net/core/rtnetlink.c
---- linux-2.6.32.45/net/core/rtnetlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/core/rtnetlink.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/net/core/rtnetlink.c linux-2.6.32.46/net/core/rtnetlink.c
+--- linux-2.6.32.46/net/core/rtnetlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/core/rtnetlink.c	2011-08-05 20:33:55.000000000 -0400
 @@ -57,7 +57,7 @@ struct rtnl_link
  {
  	rtnl_doit_func		doit;
@@ -71113,9 +73895,9 @@ diff -urNp linux-2.6.32.45/net/core/rtnetlink.c linux-2.6.32.45/net/core/rtnetli
  
  static DEFINE_MUTEX(rtnl_mutex);
  
-diff -urNp linux-2.6.32.45/net/core/secure_seq.c linux-2.6.32.45/net/core/secure_seq.c
---- linux-2.6.32.45/net/core/secure_seq.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/core/secure_seq.c	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/net/core/secure_seq.c linux-2.6.32.46/net/core/secure_seq.c
+--- linux-2.6.32.46/net/core/secure_seq.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/core/secure_seq.c	2011-08-07 19:48:09.000000000 -0400
 @@ -57,7 +57,7 @@ __u32 secure_tcpv6_sequence_number(__be3
  EXPORT_SYMBOL(secure_tcpv6_sequence_number);
  
@@ -71133,9 +73915,9 @@ diff -urNp linux-2.6.32.45/net/core/secure_seq.c linux-2.6.32.45/net/core/secure
  	return hash[0];
  }
  #endif
-diff -urNp linux-2.6.32.45/net/core/skbuff.c linux-2.6.32.45/net/core/skbuff.c
---- linux-2.6.32.45/net/core/skbuff.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/core/skbuff.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/core/skbuff.c linux-2.6.32.46/net/core/skbuff.c
+--- linux-2.6.32.46/net/core/skbuff.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/core/skbuff.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1544,6 +1544,8 @@ int skb_splice_bits(struct sk_buff *skb,
  	struct sk_buff *frag_iter;
  	struct sock *sk = skb->sk;
@@ -71145,9 +73927,9 @@ diff -urNp linux-2.6.32.45/net/core/skbuff.c linux-2.6.32.45/net/core/skbuff.c
  	/*
  	 * __skb_splice_bits() only fails if the output has no room left,
  	 * so no point in going over the frag_list for the error case.
-diff -urNp linux-2.6.32.45/net/core/sock.c linux-2.6.32.45/net/core/sock.c
---- linux-2.6.32.45/net/core/sock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/core/sock.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/net/core/sock.c linux-2.6.32.46/net/core/sock.c
+--- linux-2.6.32.46/net/core/sock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/core/sock.c	2011-05-04 17:56:20.000000000 -0400
 @@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock,
  		break;
  
@@ -71174,9 +73956,9 @@ diff -urNp linux-2.6.32.45/net/core/sock.c linux-2.6.32.45/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-2.6.32.45/net/decnet/sysctl_net_decnet.c linux-2.6.32.45/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.45/net/decnet/sysctl_net_decnet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/decnet/sysctl_net_decnet.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/decnet/sysctl_net_decnet.c linux-2.6.32.46/net/decnet/sysctl_net_decnet.c
+--- linux-2.6.32.46/net/decnet/sysctl_net_decnet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/decnet/sysctl_net_decnet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
@@ -71195,9 +73977,9 @@ diff -urNp linux-2.6.32.45/net/decnet/sysctl_net_decnet.c linux-2.6.32.45/net/de
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-2.6.32.45/net/econet/Kconfig linux-2.6.32.45/net/econet/Kconfig
---- linux-2.6.32.45/net/econet/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/econet/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/econet/Kconfig linux-2.6.32.46/net/econet/Kconfig
+--- linux-2.6.32.46/net/econet/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/econet/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -71207,9 +73989,9 @@ diff -urNp linux-2.6.32.45/net/econet/Kconfig linux-2.6.32.45/net/econet/Kconfig
  	---help---
  	  Econet is a fairly old and slow networking protocol mainly used by
  	  Acorn computers to access file and print servers. It uses native
-diff -urNp linux-2.6.32.45/net/ieee802154/dgram.c linux-2.6.32.45/net/ieee802154/dgram.c
---- linux-2.6.32.45/net/ieee802154/dgram.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ieee802154/dgram.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ieee802154/dgram.c linux-2.6.32.46/net/ieee802154/dgram.c
+--- linux-2.6.32.46/net/ieee802154/dgram.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ieee802154/dgram.c	2011-05-04 17:56:28.000000000 -0400
 @@ -318,7 +318,7 @@ out:
  static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)
  {
@@ -71219,9 +74001,9 @@ diff -urNp linux-2.6.32.45/net/ieee802154/dgram.c linux-2.6.32.45/net/ieee802154
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-diff -urNp linux-2.6.32.45/net/ieee802154/raw.c linux-2.6.32.45/net/ieee802154/raw.c
---- linux-2.6.32.45/net/ieee802154/raw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ieee802154/raw.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ieee802154/raw.c linux-2.6.32.46/net/ieee802154/raw.c
+--- linux-2.6.32.46/net/ieee802154/raw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ieee802154/raw.c	2011-05-04 17:56:28.000000000 -0400
 @@ -206,7 +206,7 @@ out:
  static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
  {
@@ -71231,9 +74013,9 @@ diff -urNp linux-2.6.32.45/net/ieee802154/raw.c linux-2.6.32.45/net/ieee802154/r
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-diff -urNp linux-2.6.32.45/net/ipv4/inet_diag.c linux-2.6.32.45/net/ipv4/inet_diag.c
---- linux-2.6.32.45/net/ipv4/inet_diag.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/inet_diag.c	2011-06-20 19:31:13.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/inet_diag.c linux-2.6.32.46/net/ipv4/inet_diag.c
+--- linux-2.6.32.46/net/ipv4/inet_diag.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/inet_diag.c	2011-06-20 19:31:13.000000000 -0400
 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
@@ -71294,9 +74076,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/inet_diag.c linux-2.6.32.45/net/ipv4/inet_di
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-2.6.32.45/net/ipv4/inet_hashtables.c linux-2.6.32.45/net/ipv4/inet_hashtables.c
---- linux-2.6.32.45/net/ipv4/inet_hashtables.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/inet_hashtables.c	2011-08-16 20:42:30.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/inet_hashtables.c linux-2.6.32.46/net/ipv4/inet_hashtables.c
+--- linux-2.6.32.46/net/ipv4/inet_hashtables.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/inet_hashtables.c	2011-08-16 20:42:30.000000000 -0400
 @@ -18,12 +18,15 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -71322,9 +74104,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/inet_hashtables.c linux-2.6.32.45/net/ipv4/i
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			inet_twsk_put(tw);
-diff -urNp linux-2.6.32.45/net/ipv4/inetpeer.c linux-2.6.32.45/net/ipv4/inetpeer.c
---- linux-2.6.32.45/net/ipv4/inetpeer.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/inetpeer.c	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/inetpeer.c linux-2.6.32.46/net/ipv4/inetpeer.c
+--- linux-2.6.32.46/net/ipv4/inetpeer.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/inetpeer.c	2011-08-07 19:48:09.000000000 -0400
 @@ -367,6 +367,8 @@ struct inet_peer *inet_getpeer(__be32 da
  	struct inet_peer *p, *n;
  	struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr;
@@ -71343,9 +74125,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/inetpeer.c linux-2.6.32.45/net/ipv4/inetpeer
  	n->ip_id_count = secure_ip_id(daddr);
  	n->tcp_ts_stamp = 0;
  
-diff -urNp linux-2.6.32.45/net/ipv4/ip_fragment.c linux-2.6.32.45/net/ipv4/ip_fragment.c
---- linux-2.6.32.45/net/ipv4/ip_fragment.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/ip_fragment.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/ip_fragment.c linux-2.6.32.46/net/ipv4/ip_fragment.c
+--- linux-2.6.32.46/net/ipv4/ip_fragment.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/ip_fragment.c	2011-04-17 15:56:46.000000000 -0400
 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
@@ -71355,9 +74137,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/ip_fragment.c linux-2.6.32.45/net/ipv4/ip_fr
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-2.6.32.45/net/ipv4/ip_sockglue.c linux-2.6.32.45/net/ipv4/ip_sockglue.c
---- linux-2.6.32.45/net/ipv4/ip_sockglue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/ip_sockglue.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/ip_sockglue.c linux-2.6.32.46/net/ipv4/ip_sockglue.c
+--- linux-2.6.32.46/net/ipv4/ip_sockglue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/ip_sockglue.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1015,6 +1015,8 @@ static int do_ip_getsockopt(struct sock 
  	int val;
  	int len;
@@ -71367,9 +74149,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/ip_sockglue.c linux-2.6.32.45/net/ipv4/ip_so
  	if (level != SOL_IP)
  		return -EOPNOTSUPP;
  
-diff -urNp linux-2.6.32.45/net/ipv4/netfilter/arp_tables.c linux-2.6.32.45/net/ipv4/netfilter/arp_tables.c
---- linux-2.6.32.45/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c
+--- linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:04:18.000000000 -0400
 @@ -934,6 +934,7 @@ static int get_info(struct net *net, voi
  			private = &tmp;
  		}
@@ -71378,9 +74160,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/netfilter/arp_tables.c linux-2.6.32.45/net/i
  		info.valid_hooks = t->valid_hooks;
  		memcpy(info.hook_entry, private->hook_entry,
  		       sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.45/net/ipv4/netfilter/ip_queue.c linux-2.6.32.45/net/ipv4/netfilter/ip_queue.c
---- linux-2.6.32.45/net/ipv4/netfilter/ip_queue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/netfilter/ip_queue.c	2011-08-21 18:42:53.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c
+--- linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/netfilter/ip_queue.c	2011-08-21 18:42:53.000000000 -0400
 @@ -286,6 +286,9 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, st
  
  	if (v->data_len < sizeof(*user_iph))
@@ -71401,9 +74183,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/netfilter/ip_queue.c linux-2.6.32.45/net/ipv
  	struct nlmsghdr *nlh;
  
  	skblen = skb->len;
-diff -urNp linux-2.6.32.45/net/ipv4/netfilter/ip_tables.c linux-2.6.32.45/net/ipv4/netfilter/ip_tables.c
---- linux-2.6.32.45/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c
+--- linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/netfilter/ip_tables.c	2011-04-17 17:04:18.000000000 -0400
 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, voi
  			private = &tmp;
  		}
@@ -71412,9 +74194,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/netfilter/ip_tables.c linux-2.6.32.45/net/ip
  		info.valid_hooks = t->valid_hooks;
  		memcpy(info.hook_entry, private->hook_entry,
  		       sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.45/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.45/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.45/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-04-17 15:56:46.000000000 -0400
 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
@@ -71424,9 +74206,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.4
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.32.45/net/ipv4/raw.c linux-2.6.32.45/net/ipv4/raw.c
---- linux-2.6.32.45/net/ipv4/raw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/raw.c	2011-08-14 11:46:51.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/raw.c linux-2.6.32.46/net/ipv4/raw.c
+--- linux-2.6.32.46/net/ipv4/raw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/raw.c	2011-08-14 11:46:51.000000000 -0400
 @@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk,
  	/* Charge it to the socket. */
  
@@ -71497,9 +74279,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/raw.c linux-2.6.32.45/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.45/net/ipv4/route.c linux-2.6.32.45/net/ipv4/route.c
---- linux-2.6.32.45/net/ipv4/route.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/route.c	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/route.c linux-2.6.32.46/net/ipv4/route.c
+--- linux-2.6.32.46/net/ipv4/route.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/route.c	2011-08-07 19:48:09.000000000 -0400
 @@ -269,7 +269,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
@@ -71527,9 +74309,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/route.c linux-2.6.32.45/net/ipv4/route.c
  			(int) ((num_physpages ^ (num_physpages>>8)) ^
  			(jiffies ^ (jiffies >> 7))));
  
-diff -urNp linux-2.6.32.45/net/ipv4/tcp.c linux-2.6.32.45/net/ipv4/tcp.c
---- linux-2.6.32.45/net/ipv4/tcp.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/tcp.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/tcp.c linux-2.6.32.46/net/ipv4/tcp.c
+--- linux-2.6.32.46/net/ipv4/tcp.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/tcp.c	2011-05-16 21:46:57.000000000 -0400
 @@ -2085,6 +2085,8 @@ static int do_tcp_setsockopt(struct sock
  	int val;
  	int err = 0;
@@ -71548,9 +74330,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/tcp.c linux-2.6.32.45/net/ipv4/tcp.c
  	if (get_user(len, optlen))
  		return -EFAULT;
  
-diff -urNp linux-2.6.32.45/net/ipv4/tcp_ipv4.c linux-2.6.32.45/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.45/net/ipv4/tcp_ipv4.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/tcp_ipv4.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/tcp_ipv4.c linux-2.6.32.46/net/ipv4/tcp_ipv4.c
+--- linux-2.6.32.46/net/ipv4/tcp_ipv4.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/tcp_ipv4.c	2011-08-23 21:22:32.000000000 -0400
 @@ -85,6 +85,9 @@
  int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
@@ -71646,9 +74428,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/tcp_ipv4.c linux-2.6.32.45/net/ipv4/tcp_ipv4
  }
  
  #define TMPSZ 150
-diff -urNp linux-2.6.32.45/net/ipv4/tcp_minisocks.c linux-2.6.32.45/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.45/net/ipv4/tcp_minisocks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/tcp_minisocks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/tcp_minisocks.c linux-2.6.32.46/net/ipv4/tcp_minisocks.c
+--- linux-2.6.32.46/net/ipv4/tcp_minisocks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/tcp_minisocks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -26,6 +26,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -71671,9 +74453,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/tcp_minisocks.c linux-2.6.32.45/net/ipv4/tcp
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-2.6.32.45/net/ipv4/tcp_output.c linux-2.6.32.45/net/ipv4/tcp_output.c
---- linux-2.6.32.45/net/ipv4/tcp_output.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/tcp_output.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/tcp_output.c linux-2.6.32.46/net/ipv4/tcp_output.c
+--- linux-2.6.32.46/net/ipv4/tcp_output.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/tcp_output.c	2011-05-16 21:46:57.000000000 -0400
 @@ -2234,6 +2234,8 @@ struct sk_buff *tcp_make_synack(struct s
  	__u8 *md5_hash_location;
  	int mss;
@@ -71683,9 +74465,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/tcp_output.c linux-2.6.32.45/net/ipv4/tcp_ou
  	skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC);
  	if (skb == NULL)
  		return NULL;
-diff -urNp linux-2.6.32.45/net/ipv4/tcp_probe.c linux-2.6.32.45/net/ipv4/tcp_probe.c
---- linux-2.6.32.45/net/ipv4/tcp_probe.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/tcp_probe.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/tcp_probe.c linux-2.6.32.46/net/ipv4/tcp_probe.c
+--- linux-2.6.32.46/net/ipv4/tcp_probe.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/tcp_probe.c	2011-04-17 15:56:46.000000000 -0400
 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
@@ -71695,9 +74477,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/tcp_probe.c linux-2.6.32.45/net/ipv4/tcp_pro
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-2.6.32.45/net/ipv4/tcp_timer.c linux-2.6.32.45/net/ipv4/tcp_timer.c
---- linux-2.6.32.45/net/ipv4/tcp_timer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/tcp_timer.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/tcp_timer.c linux-2.6.32.46/net/ipv4/tcp_timer.c
+--- linux-2.6.32.46/net/ipv4/tcp_timer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/tcp_timer.c	2011-04-17 15:56:46.000000000 -0400
 @@ -21,6 +21,10 @@
  #include <linux/module.h>
  #include <net/tcp.h>
@@ -71723,9 +74505,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/tcp_timer.c linux-2.6.32.45/net/ipv4/tcp_tim
  	if (retransmits_timed_out(sk, retry_until)) {
  		/* Has it gone just too far? */
  		tcp_write_err(sk);
-diff -urNp linux-2.6.32.45/net/ipv4/udp.c linux-2.6.32.45/net/ipv4/udp.c
---- linux-2.6.32.45/net/ipv4/udp.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/net/ipv4/udp.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv4/udp.c linux-2.6.32.46/net/ipv4/udp.c
+--- linux-2.6.32.46/net/ipv4/udp.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/udp.c	2011-08-23 21:22:32.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -71820,9 +74602,9 @@ diff -urNp linux-2.6.32.45/net/ipv4/udp.c linux-2.6.32.45/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.45/net/ipv6/inet6_connection_sock.c linux-2.6.32.45/net/ipv6/inet6_connection_sock.c
---- linux-2.6.32.45/net/ipv6/inet6_connection_sock.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/inet6_connection_sock.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/inet6_connection_sock.c linux-2.6.32.46/net/ipv6/inet6_connection_sock.c
+--- linux-2.6.32.46/net/ipv6/inet6_connection_sock.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/inet6_connection_sock.c	2011-05-04 17:56:28.000000000 -0400
 @@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
  	{
@@ -71841,9 +74623,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/inet6_connection_sock.c linux-2.6.32.45/net/
  			sk->sk_dst_cache = NULL;
  			dst_release(dst);
  			dst = NULL;
-diff -urNp linux-2.6.32.45/net/ipv6/inet6_hashtables.c linux-2.6.32.45/net/ipv6/inet6_hashtables.c
---- linux-2.6.32.45/net/ipv6/inet6_hashtables.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/inet6_hashtables.c	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/inet6_hashtables.c linux-2.6.32.46/net/ipv6/inet6_hashtables.c
+--- linux-2.6.32.46/net/ipv6/inet6_hashtables.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/inet6_hashtables.c	2011-08-07 19:48:09.000000000 -0400
 @@ -119,7 +119,7 @@ out:
  }
  EXPORT_SYMBOL(__inet6_lookup_established);
@@ -71853,9 +74635,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/inet6_hashtables.c linux-2.6.32.45/net/ipv6/
  				const unsigned short hnum,
  				const struct in6_addr *daddr,
  				const int dif)
-diff -urNp linux-2.6.32.45/net/ipv6/ip6_tunnel.c linux-2.6.32.45/net/ipv6/ip6_tunnel.c
---- linux-2.6.32.45/net/ipv6/ip6_tunnel.c	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/ip6_tunnel.c	2011-08-24 18:52:25.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/ip6_tunnel.c linux-2.6.32.46/net/ipv6/ip6_tunnel.c
+--- linux-2.6.32.46/net/ipv6/ip6_tunnel.c	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/ip6_tunnel.c	2011-08-24 18:52:25.000000000 -0400
 @@ -1466,7 +1466,7 @@ static int __init ip6_tunnel_init(void)
  {
  	int  err;
@@ -71874,9 +74656,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/ip6_tunnel.c linux-2.6.32.45/net/ipv6/ip6_tu
  out_pernet:
  	return err;
  }
-diff -urNp linux-2.6.32.45/net/ipv6/ipv6_sockglue.c linux-2.6.32.45/net/ipv6/ipv6_sockglue.c
---- linux-2.6.32.45/net/ipv6/ipv6_sockglue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/ipv6_sockglue.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/ipv6_sockglue.c linux-2.6.32.46/net/ipv6/ipv6_sockglue.c
+--- linux-2.6.32.46/net/ipv6/ipv6_sockglue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/ipv6_sockglue.c	2011-05-16 21:46:57.000000000 -0400
 @@ -130,6 +130,8 @@ static int do_ipv6_setsockopt(struct soc
  	int val, valbool;
  	int retv = -ENOPROTOOPT;
@@ -71895,9 +74677,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/ipv6_sockglue.c linux-2.6.32.45/net/ipv6/ipv
  	if (ip6_mroute_opt(optname))
  		return ip6_mroute_getsockopt(sk, optname, optval, optlen);
  
-diff -urNp linux-2.6.32.45/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.45/net/ipv6/netfilter/ip6_queue.c
---- linux-2.6.32.45/net/ipv6/netfilter/ip6_queue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/netfilter/ip6_queue.c	2011-08-21 18:43:32.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c
+--- linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/netfilter/ip6_queue.c	2011-08-21 18:43:32.000000000 -0400
 @@ -287,6 +287,9 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, st
  
  	if (v->data_len < sizeof(*user_iph))
@@ -71918,9 +74700,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/netfilter/ip6_queue.c linux-2.6.32.45/net/ip
  	struct nlmsghdr *nlh;
  
  	skblen = skb->len;
-diff -urNp linux-2.6.32.45/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.45/net/ipv6/netfilter/ip6_tables.c
---- linux-2.6.32.45/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:04:18.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c
+--- linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/netfilter/ip6_tables.c	2011-04-17 17:04:18.000000000 -0400
 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, voi
  			private = &tmp;
  		}
@@ -71929,9 +74711,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/netfilter/ip6_tables.c linux-2.6.32.45/net/i
  		info.valid_hooks = t->valid_hooks;
  		memcpy(info.hook_entry, private->hook_entry,
  		       sizeof(info.hook_entry));
-diff -urNp linux-2.6.32.45/net/ipv6/raw.c linux-2.6.32.45/net/ipv6/raw.c
---- linux-2.6.32.45/net/ipv6/raw.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/raw.c	2011-08-14 11:48:20.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/raw.c linux-2.6.32.46/net/ipv6/raw.c
+--- linux-2.6.32.46/net/ipv6/raw.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/raw.c	2011-08-14 11:48:20.000000000 -0400
 @@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct s
  {
  	if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
@@ -72046,9 +74828,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/raw.c linux-2.6.32.45/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.45/net/ipv6/tcp_ipv6.c linux-2.6.32.45/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.45/net/ipv6/tcp_ipv6.c	2011-08-16 20:37:25.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/tcp_ipv6.c	2011-08-07 19:48:09.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/tcp_ipv6.c linux-2.6.32.46/net/ipv6/tcp_ipv6.c
+--- linux-2.6.32.46/net/ipv6/tcp_ipv6.c	2011-08-16 20:37:25.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/tcp_ipv6.c	2011-08-07 19:48:09.000000000 -0400
 @@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -72148,9 +74930,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/tcp_ipv6.c linux-2.6.32.45/net/ipv6/tcp_ipv6
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.45/net/ipv6/udp.c linux-2.6.32.45/net/ipv6/udp.c
---- linux-2.6.32.45/net/ipv6/udp.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/net/ipv6/udp.c	2011-07-13 17:23:27.000000000 -0400
+diff -urNp linux-2.6.32.46/net/ipv6/udp.c linux-2.6.32.46/net/ipv6/udp.c
+--- linux-2.6.32.46/net/ipv6/udp.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/net/ipv6/udp.c	2011-07-13 17:23:27.000000000 -0400
 @@ -49,6 +49,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -72197,9 +74979,9 @@ diff -urNp linux-2.6.32.45/net/ipv6/udp.c linux-2.6.32.45/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-2.6.32.45/net/irda/ircomm/ircomm_tty.c linux-2.6.32.45/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.45/net/irda/ircomm/ircomm_tty.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/irda/ircomm/ircomm_tty.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/irda/ircomm/ircomm_tty.c	2011-04-17 15:56:46.000000000 -0400
 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
@@ -72322,9 +75104,9 @@ diff -urNp linux-2.6.32.45/net/irda/ircomm/ircomm_tty.c linux-2.6.32.45/net/irda
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-2.6.32.45/net/iucv/af_iucv.c linux-2.6.32.45/net/iucv/af_iucv.c
---- linux-2.6.32.45/net/iucv/af_iucv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/iucv/af_iucv.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/iucv/af_iucv.c linux-2.6.32.46/net/iucv/af_iucv.c
+--- linux-2.6.32.46/net/iucv/af_iucv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/iucv/af_iucv.c	2011-05-04 17:56:28.000000000 -0400
 @@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct soc
  
  	write_lock_bh(&iucv_sk_list.lock);
@@ -72338,9 +75120,9 @@ diff -urNp linux-2.6.32.45/net/iucv/af_iucv.c linux-2.6.32.45/net/iucv/af_iucv.c
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-2.6.32.45/net/key/af_key.c linux-2.6.32.45/net/key/af_key.c
---- linux-2.6.32.45/net/key/af_key.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/key/af_key.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/key/af_key.c linux-2.6.32.46/net/key/af_key.c
+--- linux-2.6.32.46/net/key/af_key.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/key/af_key.c	2011-05-16 21:46:57.000000000 -0400
 @@ -2489,6 +2489,8 @@ static int pfkey_migrate(struct sock *sk
  	struct xfrm_migrate m[XFRM_MAX_DEPTH];
  	struct xfrm_kmaddress k;
@@ -72362,9 +75144,9 @@ diff -urNp linux-2.6.32.45/net/key/af_key.c linux-2.6.32.45/net/key/af_key.c
  			       atomic_read(&s->sk_refcnt),
  			       sk_rmem_alloc_get(s),
  			       sk_wmem_alloc_get(s),
-diff -urNp linux-2.6.32.45/net/lapb/lapb_iface.c linux-2.6.32.45/net/lapb/lapb_iface.c
---- linux-2.6.32.45/net/lapb/lapb_iface.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/lapb/lapb_iface.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/net/lapb/lapb_iface.c linux-2.6.32.46/net/lapb/lapb_iface.c
+--- linux-2.6.32.46/net/lapb/lapb_iface.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/lapb/lapb_iface.c	2011-08-05 20:33:55.000000000 -0400
 @@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev
  		goto out;
  
@@ -72428,9 +75210,9 @@ diff -urNp linux-2.6.32.45/net/lapb/lapb_iface.c linux-2.6.32.45/net/lapb/lapb_i
  		used = 1;
  	}
  
-diff -urNp linux-2.6.32.45/net/mac80211/cfg.c linux-2.6.32.45/net/mac80211/cfg.c
---- linux-2.6.32.45/net/mac80211/cfg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/cfg.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/cfg.c linux-2.6.32.46/net/mac80211/cfg.c
+--- linux-2.6.32.46/net/mac80211/cfg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/cfg.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(st
  	return err;
  }
@@ -72440,9 +75222,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/cfg.c linux-2.6.32.45/net/mac80211/cfg.c
  	.add_virtual_intf = ieee80211_add_iface,
  	.del_virtual_intf = ieee80211_del_iface,
  	.change_virtual_intf = ieee80211_change_iface,
-diff -urNp linux-2.6.32.45/net/mac80211/cfg.h linux-2.6.32.45/net/mac80211/cfg.h
---- linux-2.6.32.45/net/mac80211/cfg.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/cfg.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/cfg.h linux-2.6.32.46/net/mac80211/cfg.h
+--- linux-2.6.32.46/net/mac80211/cfg.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/cfg.h	2011-04-17 15:56:46.000000000 -0400
 @@ -4,6 +4,6 @@
  #ifndef __CFG_H
  #define __CFG_H
@@ -72451,9 +75233,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/cfg.h linux-2.6.32.45/net/mac80211/cfg.h
 +extern const struct cfg80211_ops mac80211_config_ops;
  
  #endif /* __CFG_H */
-diff -urNp linux-2.6.32.45/net/mac80211/debugfs_key.c linux-2.6.32.45/net/mac80211/debugfs_key.c
---- linux-2.6.32.45/net/mac80211/debugfs_key.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/debugfs_key.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/debugfs_key.c linux-2.6.32.46/net/mac80211/debugfs_key.c
+--- linux-2.6.32.46/net/mac80211/debugfs_key.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/debugfs_key.c	2011-04-17 15:56:46.000000000 -0400
 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file 
  			    size_t count, loff_t *ppos)
  {
@@ -72469,9 +75251,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/debugfs_key.c linux-2.6.32.45/net/mac802
  
  	for (i = 0; i < key->conf.keylen; i++)
  		p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
-diff -urNp linux-2.6.32.45/net/mac80211/debugfs_sta.c linux-2.6.32.45/net/mac80211/debugfs_sta.c
---- linux-2.6.32.45/net/mac80211/debugfs_sta.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/debugfs_sta.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/debugfs_sta.c linux-2.6.32.46/net/mac80211/debugfs_sta.c
+--- linux-2.6.32.46/net/mac80211/debugfs_sta.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/debugfs_sta.c	2011-05-16 21:46:57.000000000 -0400
 @@ -124,6 +124,8 @@ static ssize_t sta_agg_status_read(struc
  	int i;
  	struct sta_info *sta = file->private_data;
@@ -72481,9 +75263,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/debugfs_sta.c linux-2.6.32.45/net/mac802
  	spin_lock_bh(&sta->lock);
  	p += scnprintf(p, sizeof(buf)+buf-p, "next dialog_token is %#02x\n",
  			sta->ampdu_mlme.dialog_token_allocator + 1);
-diff -urNp linux-2.6.32.45/net/mac80211/ieee80211_i.h linux-2.6.32.45/net/mac80211/ieee80211_i.h
---- linux-2.6.32.45/net/mac80211/ieee80211_i.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/ieee80211_i.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/ieee80211_i.h linux-2.6.32.46/net/mac80211/ieee80211_i.h
+--- linux-2.6.32.46/net/mac80211/ieee80211_i.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/ieee80211_i.h	2011-04-17 15:56:46.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/etherdevice.h>
  #include <net/cfg80211.h>
@@ -72501,9 +75283,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/ieee80211_i.h linux-2.6.32.45/net/mac802
  	int monitors, cooked_mntrs;
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
-diff -urNp linux-2.6.32.45/net/mac80211/iface.c linux-2.6.32.45/net/mac80211/iface.c
---- linux-2.6.32.45/net/mac80211/iface.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/iface.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/iface.c linux-2.6.32.46/net/mac80211/iface.c
+--- linux-2.6.32.46/net/mac80211/iface.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/iface.c	2011-04-17 15:56:46.000000000 -0400
 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
  		break;
  	}
@@ -72558,9 +75340,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/iface.c linux-2.6.32.45/net/mac80211/ifa
  		ieee80211_clear_tx_pending(local);
  		ieee80211_stop_device(local);
  
-diff -urNp linux-2.6.32.45/net/mac80211/main.c linux-2.6.32.45/net/mac80211/main.c
---- linux-2.6.32.45/net/mac80211/main.c	2011-05-10 22:12:02.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/main.c	2011-05-10 22:12:34.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/main.c linux-2.6.32.46/net/mac80211/main.c
+--- linux-2.6.32.46/net/mac80211/main.c	2011-05-10 22:12:02.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/main.c	2011-05-10 22:12:34.000000000 -0400
 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
@@ -72570,9 +75352,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/main.c linux-2.6.32.45/net/mac80211/main
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-2.6.32.45/net/mac80211/mlme.c linux-2.6.32.45/net/mac80211/mlme.c
---- linux-2.6.32.45/net/mac80211/mlme.c	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/mlme.c	2011-08-09 18:34:01.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/mlme.c linux-2.6.32.46/net/mac80211/mlme.c
+--- linux-2.6.32.46/net/mac80211/mlme.c	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/mlme.c	2011-08-09 18:34:01.000000000 -0400
 @@ -1438,6 +1438,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
  	bool have_higher_than_11mbit = false, newsta = false;
  	u16 ap_ht_cap_flags;
@@ -72582,9 +75364,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/mlme.c linux-2.6.32.45/net/mac80211/mlme
  	/*
  	 * AssocResp and ReassocResp have identical structure, so process both
  	 * of them in this function.
-diff -urNp linux-2.6.32.45/net/mac80211/pm.c linux-2.6.32.45/net/mac80211/pm.c
---- linux-2.6.32.45/net/mac80211/pm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/pm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/pm.c linux-2.6.32.46/net/mac80211/pm.c
+--- linux-2.6.32.46/net/mac80211/pm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/pm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
  	}
  
@@ -72594,9 +75376,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/pm.c linux-2.6.32.45/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
  	local->suspended = true;
-diff -urNp linux-2.6.32.45/net/mac80211/rate.c linux-2.6.32.45/net/mac80211/rate.c
---- linux-2.6.32.45/net/mac80211/rate.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/rate.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/rate.c linux-2.6.32.46/net/mac80211/rate.c
+--- linux-2.6.32.46/net/mac80211/rate.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/rate.c	2011-04-17 15:56:46.000000000 -0400
 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  	struct rate_control_ref *ref, *old;
  
@@ -72606,9 +75388,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/rate.c linux-2.6.32.45/net/mac80211/rate
  		return -EBUSY;
  
  	ref = rate_control_alloc(name, local);
-diff -urNp linux-2.6.32.45/net/mac80211/tx.c linux-2.6.32.45/net/mac80211/tx.c
---- linux-2.6.32.45/net/mac80211/tx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/tx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/tx.c linux-2.6.32.46/net/mac80211/tx.c
+--- linux-2.6.32.46/net/mac80211/tx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/tx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct 
  	return cpu_to_le16(dur);
  }
@@ -72618,9 +75400,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/tx.c linux-2.6.32.45/net/mac80211/tx.c
  				      struct net_device *dev)
  {
  	return local == wdev_priv(dev->ieee80211_ptr);
-diff -urNp linux-2.6.32.45/net/mac80211/util.c linux-2.6.32.45/net/mac80211/util.c
---- linux-2.6.32.45/net/mac80211/util.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/mac80211/util.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/mac80211/util.c linux-2.6.32.46/net/mac80211/util.c
+--- linux-2.6.32.46/net/mac80211/util.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/mac80211/util.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_
  		local->resuming = true;
  
@@ -72630,9 +75412,9 @@ diff -urNp linux-2.6.32.45/net/mac80211/util.c linux-2.6.32.45/net/mac80211/util
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
-diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.45/net/netfilter/ipvs/ip_vs_app.c
---- linux-2.6.32.45/net/netfilter/ipvs/ip_vs_app.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/ipvs/ip_vs_app.c	2011-05-17 19:26:34.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c
+--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c	2011-05-17 19:26:34.000000000 -0400
 @@ -564,7 +564,7 @@ static const struct file_operations ip_v
  	.open	 = ip_vs_app_open,
  	.read	 = seq_read,
@@ -72642,9 +75424,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.45/net/ne
  };
  #endif
  
-diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.45/net/netfilter/ipvs/ip_vs_conn.c
---- linux-2.6.32.45/net/netfilter/ipvs/ip_vs_conn.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/ipvs/ip_vs_conn.c	2011-05-17 19:26:34.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_conn.c	2011-05-17 19:26:34.000000000 -0400
 @@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
  		/* if the connection is not template and is created
  		 * by sync, preserve the activity flag.
@@ -72694,9 +75476,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_conn.c linux-2.6.32.45/net/n
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.45/net/netfilter/ipvs/ip_vs_core.c
---- linux-2.6.32.45/net/netfilter/ipvs/ip_vs_core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/ipvs/ip_vs_core.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c
+--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_core.c	2011-05-04 17:56:28.000000000 -0400
 @@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *sv
  		ret = cp->packet_xmit(skb, cp, pp);
  		/* do not touch skb anymore */
@@ -72715,9 +75497,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_core.c linux-2.6.32.45/net/n
  	if (af == AF_INET &&
  	    (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
  	    (((cp->protocol != IPPROTO_TCP ||
-diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.45/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-2.6.32.45/net/netfilter/ipvs/ip_vs_ctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/ipvs/ip_vs_ctl.c	2011-05-17 19:26:34.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_ctl.c	2011-05-17 19:26:34.000000000 -0400
 @@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service
  		ip_vs_rs_hash(dest);
  		write_unlock_bh(&__ip_vs_rs_lock);
@@ -72790,9 +75572,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_ctl.c linux-2.6.32.45/net/ne
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
-diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.45/net/netfilter/ipvs/ip_vs_sync.c
---- linux-2.6.32.45/net/netfilter/ipvs/ip_vs_sync.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/ipvs/ip_vs_sync.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_sync.c	2011-05-04 17:56:28.000000000 -0400
 @@ -438,7 +438,7 @@ static void ip_vs_process_message(const 
  
  		if (opt)
@@ -72802,9 +75584,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_sync.c linux-2.6.32.45/net/n
  		cp->state = state;
  		cp->old_state = cp->state;
  		/*
-diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.45/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-2.6.32.45/net/netfilter/ipvs/ip_vs_xmit.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/ipvs/ip_vs_xmit.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c	2011-05-04 17:56:28.000000000 -0400
 @@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
  		else
  			rc = NF_ACCEPT;
@@ -72823,9 +75605,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.45/net/n
  		goto out;
  	}
  
-diff -urNp linux-2.6.32.45/net/netfilter/Kconfig linux-2.6.32.45/net/netfilter/Kconfig
---- linux-2.6.32.45/net/netfilter/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/Kconfig linux-2.6.32.46/net/netfilter/Kconfig
+--- linux-2.6.32.46/net/netfilter/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -72843,9 +75625,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/Kconfig linux-2.6.32.45/net/netfilter/K
  config NETFILTER_XT_MATCH_HASHLIMIT
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-2.6.32.45/net/netfilter/Makefile linux-2.6.32.45/net/netfilter/Makefile
---- linux-2.6.32.45/net/netfilter/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/Makefile	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/Makefile linux-2.6.32.46/net/netfilter/Makefile
+--- linux-2.6.32.46/net/netfilter/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/Makefile	2011-04-17 15:56:46.000000000 -0400
 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
  obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -72854,9 +75636,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/Makefile linux-2.6.32.45/net/netfilter/
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-2.6.32.45/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.45/net/netfilter/nf_conntrack_netlink.c
---- linux-2.6.32.45/net/netfilter/nf_conntrack_netlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/nf_conntrack_netlink.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c
+--- linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c	2011-04-17 15:56:46.000000000 -0400
 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlatt
  static int
  ctnetlink_parse_tuple(const struct nlattr * const cda[],
@@ -72866,9 +75648,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.45/
  {
  	struct nlattr *tb[CTA_TUPLE_MAX+1];
  	int err;
-diff -urNp linux-2.6.32.45/net/netfilter/nfnetlink_log.c linux-2.6.32.45/net/netfilter/nfnetlink_log.c
---- linux-2.6.32.45/net/netfilter/nfnetlink_log.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netfilter/nfnetlink_log.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/nfnetlink_log.c linux-2.6.32.46/net/netfilter/nfnetlink_log.c
+--- linux-2.6.32.46/net/netfilter/nfnetlink_log.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/nfnetlink_log.c	2011-05-04 17:56:28.000000000 -0400
 @@ -68,7 +68,7 @@ struct nfulnl_instance {
  };
  
@@ -72887,9 +75669,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/nfnetlink_log.c linux-2.6.32.45/net/net
  
  	if (data_len) {
  		struct nlattr *nla;
-diff -urNp linux-2.6.32.45/net/netfilter/xt_gradm.c linux-2.6.32.45/net/netfilter/xt_gradm.c
---- linux-2.6.32.45/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/net/netfilter/xt_gradm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netfilter/xt_gradm.c linux-2.6.32.46/net/netfilter/xt_gradm.c
+--- linux-2.6.32.46/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/net/netfilter/xt_gradm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -72942,9 +75724,9 @@ diff -urNp linux-2.6.32.45/net/netfilter/xt_gradm.c linux-2.6.32.45/net/netfilte
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-2.6.32.45/net/netlink/af_netlink.c linux-2.6.32.45/net/netlink/af_netlink.c
---- linux-2.6.32.45/net/netlink/af_netlink.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netlink/af_netlink.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netlink/af_netlink.c linux-2.6.32.46/net/netlink/af_netlink.c
+--- linux-2.6.32.46/net/netlink/af_netlink.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netlink/af_netlink.c	2011-05-04 17:56:28.000000000 -0400
 @@ -733,7 +733,7 @@ static void netlink_overrun(struct sock 
  			sk->sk_error_report(sk);
  		}
@@ -72979,9 +75761,9 @@ diff -urNp linux-2.6.32.45/net/netlink/af_netlink.c linux-2.6.32.45/net/netlink/
  			);
  
  	}
-diff -urNp linux-2.6.32.45/net/netrom/af_netrom.c linux-2.6.32.45/net/netrom/af_netrom.c
---- linux-2.6.32.45/net/netrom/af_netrom.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/netrom/af_netrom.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/netrom/af_netrom.c linux-2.6.32.46/net/netrom/af_netrom.c
+--- linux-2.6.32.46/net/netrom/af_netrom.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netrom/af_netrom.c	2011-04-17 15:56:46.000000000 -0400
 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
@@ -72998,9 +75780,9 @@ diff -urNp linux-2.6.32.45/net/netrom/af_netrom.c linux-2.6.32.45/net/netrom/af_
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-2.6.32.45/net/packet/af_packet.c linux-2.6.32.45/net/packet/af_packet.c
---- linux-2.6.32.45/net/packet/af_packet.c	2011-07-13 17:23:04.000000000 -0400
-+++ linux-2.6.32.45/net/packet/af_packet.c	2011-07-13 17:23:27.000000000 -0400
+diff -urNp linux-2.6.32.46/net/packet/af_packet.c linux-2.6.32.46/net/packet/af_packet.c
+--- linux-2.6.32.46/net/packet/af_packet.c	2011-07-13 17:23:04.000000000 -0400
++++ linux-2.6.32.46/net/packet/af_packet.c	2011-07-13 17:23:27.000000000 -0400
 @@ -2429,7 +2429,11 @@ static int packet_seq_show(struct seq_fi
  
  		seq_printf(seq,
@@ -73013,9 +75795,9 @@ diff -urNp linux-2.6.32.45/net/packet/af_packet.c linux-2.6.32.45/net/packet/af_
  			   atomic_read(&s->sk_refcnt),
  			   s->sk_type,
  			   ntohs(po->num),
-diff -urNp linux-2.6.32.45/net/phonet/af_phonet.c linux-2.6.32.45/net/phonet/af_phonet.c
---- linux-2.6.32.45/net/phonet/af_phonet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/phonet/af_phonet.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/phonet/af_phonet.c linux-2.6.32.46/net/phonet/af_phonet.c
+--- linux-2.6.32.46/net/phonet/af_phonet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/phonet/af_phonet.c	2011-04-17 15:56:46.000000000 -0400
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
@@ -73034,9 +75816,9 @@ diff -urNp linux-2.6.32.45/net/phonet/af_phonet.c linux-2.6.32.45/net/phonet/af_
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-2.6.32.45/net/phonet/datagram.c linux-2.6.32.45/net/phonet/datagram.c
---- linux-2.6.32.45/net/phonet/datagram.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/phonet/datagram.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/phonet/datagram.c linux-2.6.32.46/net/phonet/datagram.c
+--- linux-2.6.32.46/net/phonet/datagram.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/phonet/datagram.c	2011-05-04 17:56:28.000000000 -0400
 @@ -162,7 +162,7 @@ static int pn_backlog_rcv(struct sock *s
  	if (err < 0) {
  		kfree_skb(skb);
@@ -73046,9 +75828,9 @@ diff -urNp linux-2.6.32.45/net/phonet/datagram.c linux-2.6.32.45/net/phonet/data
  	}
  	return err ? NET_RX_DROP : NET_RX_SUCCESS;
  }
-diff -urNp linux-2.6.32.45/net/phonet/pep.c linux-2.6.32.45/net/phonet/pep.c
---- linux-2.6.32.45/net/phonet/pep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/phonet/pep.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/phonet/pep.c linux-2.6.32.46/net/phonet/pep.c
+--- linux-2.6.32.46/net/phonet/pep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/phonet/pep.c	2011-05-04 17:56:28.000000000 -0400
 @@ -348,7 +348,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
  	case PNS_PEP_CTRL_REQ:
@@ -73073,9 +75855,9 @@ diff -urNp linux-2.6.32.45/net/phonet/pep.c linux-2.6.32.45/net/phonet/pep.c
  			err = -ENOBUFS;
  			break;
  		}
-diff -urNp linux-2.6.32.45/net/phonet/socket.c linux-2.6.32.45/net/phonet/socket.c
---- linux-2.6.32.45/net/phonet/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/phonet/socket.c	2011-05-04 17:57:07.000000000 -0400
+diff -urNp linux-2.6.32.46/net/phonet/socket.c linux-2.6.32.46/net/phonet/socket.c
+--- linux-2.6.32.46/net/phonet/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/phonet/socket.c	2011-05-04 17:57:07.000000000 -0400
 @@ -482,8 +482,13 @@ static int pn_sock_seq_show(struct seq_f
  			sk->sk_state,
  			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -73092,9 +75874,9 @@ diff -urNp linux-2.6.32.45/net/phonet/socket.c linux-2.6.32.45/net/phonet/socket
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff -urNp linux-2.6.32.45/net/rds/cong.c linux-2.6.32.45/net/rds/cong.c
---- linux-2.6.32.45/net/rds/cong.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rds/cong.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rds/cong.c linux-2.6.32.46/net/rds/cong.c
+--- linux-2.6.32.46/net/rds/cong.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rds/cong.c	2011-05-04 17:56:28.000000000 -0400
 @@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -73122,9 +75904,9 @@ diff -urNp linux-2.6.32.45/net/rds/cong.c linux-2.6.32.45/net/rds/cong.c
  
  	if (likely(*recent == gen))
  		return 0;
-diff -urNp linux-2.6.32.45/net/rds/iw_rdma.c linux-2.6.32.45/net/rds/iw_rdma.c
---- linux-2.6.32.45/net/rds/iw_rdma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rds/iw_rdma.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rds/iw_rdma.c linux-2.6.32.46/net/rds/iw_rdma.c
+--- linux-2.6.32.46/net/rds/iw_rdma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rds/iw_rdma.c	2011-05-16 21:46:57.000000000 -0400
 @@ -181,6 +181,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
  	struct rdma_cm_id *pcm_id;
  	int rc;
@@ -73134,9 +75916,9 @@ diff -urNp linux-2.6.32.45/net/rds/iw_rdma.c linux-2.6.32.45/net/rds/iw_rdma.c
  	src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
  	dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-2.6.32.45/net/rds/Kconfig linux-2.6.32.45/net/rds/Kconfig
---- linux-2.6.32.45/net/rds/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rds/Kconfig	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rds/Kconfig linux-2.6.32.46/net/rds/Kconfig
+--- linux-2.6.32.46/net/rds/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rds/Kconfig	2011-04-17 15:56:46.000000000 -0400
 @@ -1,7 +1,7 @@
  
  config RDS
@@ -73146,9 +75928,9 @@ diff -urNp linux-2.6.32.45/net/rds/Kconfig linux-2.6.32.45/net/rds/Kconfig
  	---help---
  	  The RDS (Reliable Datagram Sockets) protocol provides reliable,
  	  sequenced delivery of datagrams over Infiniband, iWARP,
-diff -urNp linux-2.6.32.45/net/rxrpc/af_rxrpc.c linux-2.6.32.45/net/rxrpc/af_rxrpc.c
---- linux-2.6.32.45/net/rxrpc/af_rxrpc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/af_rxrpc.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/af_rxrpc.c linux-2.6.32.46/net/rxrpc/af_rxrpc.c
+--- linux-2.6.32.46/net/rxrpc/af_rxrpc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/af_rxrpc.c	2011-05-04 17:56:28.000000000 -0400
 @@ -38,7 +38,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -73158,9 +75940,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/af_rxrpc.c linux-2.6.32.45/net/rxrpc/af_rxr
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-ack.c linux-2.6.32.45/net/rxrpc/ar-ack.c
---- linux-2.6.32.45/net/rxrpc/ar-ack.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-ack.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-ack.c linux-2.6.32.46/net/rxrpc/ar-ack.c
+--- linux-2.6.32.46/net/rxrpc/ar-ack.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-ack.c	2011-05-16 21:46:57.000000000 -0400
 @@ -174,7 +174,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  	_enter("{%d,%d,%d,%d},",
@@ -73233,9 +76015,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-ack.c linux-2.6.32.45/net/rxrpc/ar-ack.c
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-call.c linux-2.6.32.45/net/rxrpc/ar-call.c
---- linux-2.6.32.45/net/rxrpc/ar-call.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-call.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-call.c linux-2.6.32.46/net/rxrpc/ar-call.c
+--- linux-2.6.32.46/net/rxrpc/ar-call.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-call.c	2011-05-04 17:56:28.000000000 -0400
 @@ -82,7 +82,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
  	spin_lock_init(&call->lock);
  	rwlock_init(&call->state_lock);
@@ -73245,9 +76027,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-call.c linux-2.6.32.45/net/rxrpc/ar-call
  	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
  	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-connection.c linux-2.6.32.45/net/rxrpc/ar-connection.c
---- linux-2.6.32.45/net/rxrpc/ar-connection.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-connection.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-connection.c linux-2.6.32.46/net/rxrpc/ar-connection.c
+--- linux-2.6.32.46/net/rxrpc/ar-connection.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-connection.c	2011-05-04 17:56:28.000000000 -0400
 @@ -205,7 +205,7 @@ static struct rxrpc_connection *rxrpc_al
  		rwlock_init(&conn->lock);
  		spin_lock_init(&conn->state_lock);
@@ -73257,9 +76039,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-connection.c linux-2.6.32.45/net/rxrpc/a
  		conn->avail_calls = RXRPC_MAXCALLS;
  		conn->size_align = 4;
  		conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-connevent.c linux-2.6.32.45/net/rxrpc/ar-connevent.c
---- linux-2.6.32.45/net/rxrpc/ar-connevent.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-connevent.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-connevent.c linux-2.6.32.46/net/rxrpc/ar-connevent.c
+--- linux-2.6.32.46/net/rxrpc/ar-connevent.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-connevent.c	2011-05-04 17:56:28.000000000 -0400
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
  	len = iov[0].iov_len + iov[1].iov_len;
@@ -73269,9 +76051,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-connevent.c linux-2.6.32.45/net/rxrpc/ar
  	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-input.c linux-2.6.32.45/net/rxrpc/ar-input.c
---- linux-2.6.32.45/net/rxrpc/ar-input.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-input.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-input.c linux-2.6.32.46/net/rxrpc/ar-input.c
+--- linux-2.6.32.46/net/rxrpc/ar-input.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-input.c	2011-05-04 17:56:28.000000000 -0400
 @@ -339,9 +339,9 @@ void rxrpc_fast_process_packet(struct rx
  	/* track the latest serial number on this connection for ACK packet
  	 * information */
@@ -73284,9 +76066,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-input.c linux-2.6.32.45/net/rxrpc/ar-inp
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-internal.h linux-2.6.32.45/net/rxrpc/ar-internal.h
---- linux-2.6.32.45/net/rxrpc/ar-internal.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-internal.h	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-internal.h linux-2.6.32.46/net/rxrpc/ar-internal.h
+--- linux-2.6.32.46/net/rxrpc/ar-internal.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-internal.h	2011-05-04 17:56:28.000000000 -0400
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
  	int			error;		/* error code for local abort */
  	int			debug_id;	/* debug ID for printks */
@@ -73316,9 +76098,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-internal.h linux-2.6.32.45/net/rxrpc/ar-
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-key.c linux-2.6.32.45/net/rxrpc/ar-key.c
---- linux-2.6.32.45/net/rxrpc/ar-key.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-key.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-key.c linux-2.6.32.46/net/rxrpc/ar-key.c
+--- linux-2.6.32.46/net/rxrpc/ar-key.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-key.c	2011-04-17 15:56:46.000000000 -0400
 @@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(s
  		return ret;
  
@@ -73346,9 +76128,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-key.c linux-2.6.32.45/net/rxrpc/ar-key.c
  	if (!token->kad)
  		goto error_free;
  
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-local.c linux-2.6.32.45/net/rxrpc/ar-local.c
---- linux-2.6.32.45/net/rxrpc/ar-local.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-local.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-local.c linux-2.6.32.46/net/rxrpc/ar-local.c
+--- linux-2.6.32.46/net/rxrpc/ar-local.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-local.c	2011-05-04 17:56:28.000000000 -0400
 @@ -44,7 +44,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
  		spin_lock_init(&local->lock);
  		rwlock_init(&local->services_lock);
@@ -73358,9 +76140,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-local.c linux-2.6.32.45/net/rxrpc/ar-loc
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-output.c linux-2.6.32.45/net/rxrpc/ar-output.c
---- linux-2.6.32.45/net/rxrpc/ar-output.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-output.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-output.c linux-2.6.32.46/net/rxrpc/ar-output.c
+--- linux-2.6.32.46/net/rxrpc/ar-output.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-output.c	2011-05-04 17:56:28.000000000 -0400
 @@ -680,9 +680,9 @@ static int rxrpc_send_data(struct kiocb 
  			sp->hdr.cid = call->cid;
  			sp->hdr.callNumber = call->call_id;
@@ -73373,9 +76155,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-output.c linux-2.6.32.45/net/rxrpc/ar-ou
  			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
  			sp->hdr.userStatus = 0;
  			sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-peer.c linux-2.6.32.45/net/rxrpc/ar-peer.c
---- linux-2.6.32.45/net/rxrpc/ar-peer.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-peer.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-peer.c linux-2.6.32.46/net/rxrpc/ar-peer.c
+--- linux-2.6.32.46/net/rxrpc/ar-peer.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-peer.c	2011-05-04 17:56:28.000000000 -0400
 @@ -86,7 +86,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
  		INIT_LIST_HEAD(&peer->error_targets);
  		spin_lock_init(&peer->lock);
@@ -73385,9 +76167,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-peer.c linux-2.6.32.45/net/rxrpc/ar-peer
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-proc.c linux-2.6.32.45/net/rxrpc/ar-proc.c
---- linux-2.6.32.45/net/rxrpc/ar-proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-proc.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-proc.c linux-2.6.32.46/net/rxrpc/ar-proc.c
+--- linux-2.6.32.46/net/rxrpc/ar-proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-proc.c	2011-05-04 17:56:28.000000000 -0400
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
  		   atomic_read(&conn->usage),
  		   rxrpc_conn_states[conn->state],
@@ -73399,9 +76181,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-proc.c linux-2.6.32.45/net/rxrpc/ar-proc
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/net/rxrpc/ar-transport.c linux-2.6.32.45/net/rxrpc/ar-transport.c
---- linux-2.6.32.45/net/rxrpc/ar-transport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/ar-transport.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/ar-transport.c linux-2.6.32.46/net/rxrpc/ar-transport.c
+--- linux-2.6.32.46/net/rxrpc/ar-transport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/ar-transport.c	2011-05-04 17:56:28.000000000 -0400
 @@ -46,7 +46,7 @@ static struct rxrpc_transport *rxrpc_all
  		spin_lock_init(&trans->client_lock);
  		rwlock_init(&trans->conn_lock);
@@ -73411,9 +76193,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/ar-transport.c linux-2.6.32.45/net/rxrpc/ar
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff -urNp linux-2.6.32.45/net/rxrpc/rxkad.c linux-2.6.32.45/net/rxrpc/rxkad.c
---- linux-2.6.32.45/net/rxrpc/rxkad.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/rxrpc/rxkad.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/rxrpc/rxkad.c linux-2.6.32.46/net/rxrpc/rxkad.c
+--- linux-2.6.32.46/net/rxrpc/rxkad.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rxrpc/rxkad.c	2011-05-16 21:46:57.000000000 -0400
 @@ -210,6 +210,8 @@ static int rxkad_secure_packet_encrypt(c
  	u16 check;
  	int nsg;
@@ -73450,9 +76232,9 @@ diff -urNp linux-2.6.32.45/net/rxrpc/rxkad.c linux-2.6.32.45/net/rxrpc/rxkad.c
  	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-2.6.32.45/net/sctp/proc.c linux-2.6.32.45/net/sctp/proc.c
---- linux-2.6.32.45/net/sctp/proc.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sctp/proc.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sctp/proc.c linux-2.6.32.46/net/sctp/proc.c
+--- linux-2.6.32.46/net/sctp/proc.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sctp/proc.c	2011-04-17 15:56:46.000000000 -0400
 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_
  	sctp_for_each_hentry(epb, node, &head->chain) {
  		ep = sctp_ep(epb);
@@ -73481,9 +76263,9 @@ diff -urNp linux-2.6.32.45/net/sctp/proc.c linux-2.6.32.45/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-2.6.32.45/net/sctp/socket.c linux-2.6.32.45/net/sctp/socket.c
---- linux-2.6.32.45/net/sctp/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sctp/socket.c	2011-04-23 12:56:11.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sctp/socket.c linux-2.6.32.46/net/sctp/socket.c
+--- linux-2.6.32.46/net/sctp/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sctp/socket.c	2011-04-23 12:56:11.000000000 -0400
 @@ -5802,7 +5802,6 @@ pp_found:
  		 */
  		int reuse = sk->sk_reuse;
@@ -73492,9 +76274,9 @@ diff -urNp linux-2.6.32.45/net/sctp/socket.c linux-2.6.32.45/net/sctp/socket.c
  
  		SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
  		if (pp->fastreuse && sk->sk_reuse &&
-diff -urNp linux-2.6.32.45/net/socket.c linux-2.6.32.45/net/socket.c
---- linux-2.6.32.45/net/socket.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/socket.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/socket.c linux-2.6.32.46/net/socket.c
+--- linux-2.6.32.46/net/socket.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/socket.c	2011-05-16 21:46:57.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <linux/wireless.h>
  #include <linux/nsproxy.h>
@@ -73667,9 +76449,9 @@ diff -urNp linux-2.6.32.45/net/socket.c linux-2.6.32.45/net/socket.c
  	err = -EFAULT;
  	if (MSG_CMSG_COMPAT & flags) {
  		if (get_compat_msghdr(&msg_sys, msg_compat))
-diff -urNp linux-2.6.32.45/net/sunrpc/sched.c linux-2.6.32.45/net/sunrpc/sched.c
---- linux-2.6.32.45/net/sunrpc/sched.c	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.45/net/sunrpc/sched.c	2011-08-09 18:34:01.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sunrpc/sched.c linux-2.6.32.46/net/sunrpc/sched.c
+--- linux-2.6.32.46/net/sunrpc/sched.c	2011-08-09 18:35:30.000000000 -0400
++++ linux-2.6.32.46/net/sunrpc/sched.c	2011-08-09 18:34:01.000000000 -0400
 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -73683,9 +76465,9 @@ diff -urNp linux-2.6.32.45/net/sunrpc/sched.c linux-2.6.32.45/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma.c	2011-05-04 17:56:20.000000000 -0400
 @@ -59,15 +59,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
@@ -73793,9 +76575,9 @@ diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.45/net/su
  		.mode		= 0644,
  		.proc_handler	= &read_reset_stat,
  	},
-diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-05-04 17:56:28.000000000 -0400
 @@ -495,7 +495,7 @@ next_sge:
  			svc_rdma_put_context(ctxt, 0);
  			goto out;
@@ -73823,9 +76605,9 @@ diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-2.6.32.
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-05-04 17:56:28.000000000 -0400
 @@ -328,7 +328,7 @@ static int send_write(struct svcxprt_rdm
  	write_wr.wr.rdma.remote_addr = to;
  
@@ -73835,9 +76617,9 @@ diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-2.6.32.45
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-05-04 17:56:28.000000000 -0400
 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rd
  		return;
  
@@ -73883,9 +76665,9 @@ diff -urNp linux-2.6.32.45/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-2.6.32
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff -urNp linux-2.6.32.45/net/sysctl_net.c linux-2.6.32.45/net/sysctl_net.c
---- linux-2.6.32.45/net/sysctl_net.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/sysctl_net.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/sysctl_net.c linux-2.6.32.46/net/sysctl_net.c
+--- linux-2.6.32.46/net/sysctl_net.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/sysctl_net.c	2011-04-17 15:56:46.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
@@ -73895,9 +76677,9 @@ diff -urNp linux-2.6.32.45/net/sysctl_net.c linux-2.6.32.45/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-2.6.32.45/net/unix/af_unix.c linux-2.6.32.45/net/unix/af_unix.c
---- linux-2.6.32.45/net/unix/af_unix.c	2011-05-10 22:12:02.000000000 -0400
-+++ linux-2.6.32.45/net/unix/af_unix.c	2011-07-18 18:17:33.000000000 -0400
+diff -urNp linux-2.6.32.46/net/unix/af_unix.c linux-2.6.32.46/net/unix/af_unix.c
+--- linux-2.6.32.46/net/unix/af_unix.c	2011-05-10 22:12:02.000000000 -0400
++++ linux-2.6.32.46/net/unix/af_unix.c	2011-07-18 18:17:33.000000000 -0400
 @@ -745,6 +745,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
@@ -73956,9 +76738,9 @@ diff -urNp linux-2.6.32.45/net/unix/af_unix.c linux-2.6.32.45/net/unix/af_unix.c
  			atomic_read(&s->sk_refcnt),
  			0,
  			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff -urNp linux-2.6.32.45/net/wireless/core.h linux-2.6.32.45/net/wireless/core.h
---- linux-2.6.32.45/net/wireless/core.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/wireless/core.h	2011-08-23 21:22:38.000000000 -0400
+diff -urNp linux-2.6.32.46/net/wireless/core.h linux-2.6.32.46/net/wireless/core.h
+--- linux-2.6.32.46/net/wireless/core.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/wireless/core.h	2011-08-23 21:22:38.000000000 -0400
 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
  	struct mutex mtx;
  
@@ -73968,9 +76750,9 @@ diff -urNp linux-2.6.32.45/net/wireless/core.h linux-2.6.32.45/net/wireless/core
  	struct rfkill *rfkill;
  	struct work_struct rfkill_sync;
  
-diff -urNp linux-2.6.32.45/net/wireless/wext.c linux-2.6.32.45/net/wireless/wext.c
---- linux-2.6.32.45/net/wireless/wext.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/wireless/wext.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/net/wireless/wext.c linux-2.6.32.46/net/wireless/wext.c
+--- linux-2.6.32.46/net/wireless/wext.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/wireless/wext.c	2011-04-17 15:56:46.000000000 -0400
 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -74004,9 +76786,9 @@ diff -urNp linux-2.6.32.45/net/wireless/wext.c linux-2.6.32.45/net/wireless/wext
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-2.6.32.45/net/xfrm/xfrm_policy.c linux-2.6.32.45/net/xfrm/xfrm_policy.c
---- linux-2.6.32.45/net/xfrm/xfrm_policy.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/xfrm/xfrm_policy.c	2011-05-04 17:56:20.000000000 -0400
+diff -urNp linux-2.6.32.46/net/xfrm/xfrm_policy.c linux-2.6.32.46/net/xfrm/xfrm_policy.c
+--- linux-2.6.32.46/net/xfrm/xfrm_policy.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/xfrm/xfrm_policy.c	2011-05-04 17:56:20.000000000 -0400
 @@ -586,7 +586,7 @@ int xfrm_policy_insert(int dir, struct x
  		hlist_add_head(&policy->bydst, chain);
  	xfrm_pol_hold(policy);
@@ -74097,9 +76879,9 @@ diff -urNp linux-2.6.32.45/net/xfrm/xfrm_policy.c linux-2.6.32.45/net/xfrm/xfrm_
  					xfrm_pols_put(pols, npols);
  					goto restart;
  				}
-diff -urNp linux-2.6.32.45/net/xfrm/xfrm_user.c linux-2.6.32.45/net/xfrm/xfrm_user.c
---- linux-2.6.32.45/net/xfrm/xfrm_user.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/net/xfrm/xfrm_user.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/net/xfrm/xfrm_user.c linux-2.6.32.46/net/xfrm/xfrm_user.c
+--- linux-2.6.32.46/net/xfrm/xfrm_user.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/xfrm/xfrm_user.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1169,6 +1169,8 @@ static int copy_to_user_tmpl(struct xfrm
  	struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
  	int i;
@@ -74118,9 +76900,9 @@ diff -urNp linux-2.6.32.45/net/xfrm/xfrm_user.c linux-2.6.32.45/net/xfrm/xfrm_us
  	if (attrs[XFRMA_MIGRATE] == NULL)
  		return -EINVAL;
  
-diff -urNp linux-2.6.32.45/samples/kobject/kset-example.c linux-2.6.32.45/samples/kobject/kset-example.c
---- linux-2.6.32.45/samples/kobject/kset-example.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/samples/kobject/kset-example.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/samples/kobject/kset-example.c linux-2.6.32.46/samples/kobject/kset-example.c
+--- linux-2.6.32.46/samples/kobject/kset-example.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/samples/kobject/kset-example.c	2011-04-17 15:56:46.000000000 -0400
 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
  }
  
@@ -74130,9 +76912,9 @@ diff -urNp linux-2.6.32.45/samples/kobject/kset-example.c linux-2.6.32.45/sample
  	.show = foo_attr_show,
  	.store = foo_attr_store,
  };
-diff -urNp linux-2.6.32.45/scripts/basic/fixdep.c linux-2.6.32.45/scripts/basic/fixdep.c
---- linux-2.6.32.45/scripts/basic/fixdep.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/basic/fixdep.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/basic/fixdep.c linux-2.6.32.46/scripts/basic/fixdep.c
+--- linux-2.6.32.46/scripts/basic/fixdep.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/basic/fixdep.c	2011-04-17 15:56:46.000000000 -0400
 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen
  
  static void parse_config_file(char *map, size_t len)
@@ -74154,15 +76936,15 @@ diff -urNp linux-2.6.32.45/scripts/basic/fixdep.c linux-2.6.32.45/scripts/basic/
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.32.45/scripts/gcc-plugin.sh linux-2.6.32.45/scripts/gcc-plugin.sh
---- linux-2.6.32.45/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/scripts/gcc-plugin.sh	2011-08-23 20:24:19.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/gcc-plugin.sh linux-2.6.32.46/scripts/gcc-plugin.sh
+--- linux-2.6.32.46/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/scripts/gcc-plugin.sh	2011-08-23 20:24:19.000000000 -0400
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$* -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-2.6.32.45/scripts/Makefile.build linux-2.6.32.45/scripts/Makefile.build
---- linux-2.6.32.45/scripts/Makefile.build	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/Makefile.build	2011-08-23 20:45:11.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/Makefile.build linux-2.6.32.46/scripts/Makefile.build
+--- linux-2.6.32.46/scripts/Makefile.build	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/Makefile.build	2011-08-23 20:45:11.000000000 -0400
 @@ -59,7 +59,7 @@ endif
  endif
  
@@ -74172,9 +76954,9 @@ diff -urNp linux-2.6.32.45/scripts/Makefile.build linux-2.6.32.45/scripts/Makefi
  include scripts/Makefile.host
  endif
  
-diff -urNp linux-2.6.32.45/scripts/Makefile.clean linux-2.6.32.45/scripts/Makefile.clean
---- linux-2.6.32.45/scripts/Makefile.clean	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/Makefile.clean	2011-06-04 20:47:19.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/Makefile.clean linux-2.6.32.46/scripts/Makefile.clean
+--- linux-2.6.32.46/scripts/Makefile.clean	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/Makefile.clean	2011-06-04 20:47:19.000000000 -0400
 @@ -43,7 +43,8 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subd
  __clean-files	:= $(extra-y) $(always)                  \
  		   $(targets) $(clean-files)             \
@@ -74185,9 +76967,9 @@ diff -urNp linux-2.6.32.45/scripts/Makefile.clean linux-2.6.32.45/scripts/Makefi
  
  # as clean-files is given relative to the current directory, this adds
  # a $(obj) prefix, except for absolute paths
-diff -urNp linux-2.6.32.45/scripts/Makefile.host linux-2.6.32.45/scripts/Makefile.host
---- linux-2.6.32.45/scripts/Makefile.host	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/Makefile.host	2011-06-04 20:48:22.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/Makefile.host linux-2.6.32.46/scripts/Makefile.host
+--- linux-2.6.32.46/scripts/Makefile.host	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/Makefile.host	2011-06-04 20:48:22.000000000 -0400
 @@ -31,6 +31,7 @@
  # Note: Shared libraries consisting of C++ files are not supported
  
@@ -74204,9 +76986,9 @@ diff -urNp linux-2.6.32.45/scripts/Makefile.host linux-2.6.32.45/scripts/Makefil
  # Remove .so files from "xxx-objs"
  host-cobjs	:= $(filter-out %.so,$(host-cobjs))
  
-diff -urNp linux-2.6.32.45/scripts/mod/file2alias.c linux-2.6.32.45/scripts/mod/file2alias.c
---- linux-2.6.32.45/scripts/mod/file2alias.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/mod/file2alias.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/mod/file2alias.c linux-2.6.32.46/scripts/mod/file2alias.c
+--- linux-2.6.32.46/scripts/mod/file2alias.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/mod/file2alias.c	2011-04-17 15:56:46.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -74261,9 +77043,9 @@ diff -urNp linux-2.6.32.45/scripts/mod/file2alias.c linux-2.6.32.45/scripts/mod/
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-2.6.32.45/scripts/mod/modpost.c linux-2.6.32.45/scripts/mod/modpost.c
---- linux-2.6.32.45/scripts/mod/modpost.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/mod/modpost.c	2011-07-06 19:53:33.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/mod/modpost.c linux-2.6.32.46/scripts/mod/modpost.c
+--- linux-2.6.32.46/scripts/mod/modpost.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/mod/modpost.c	2011-07-06 19:53:33.000000000 -0400
 @@ -835,6 +835,7 @@ enum mismatch {
  	INIT_TO_EXIT,
  	EXIT_TO_INIT,
@@ -74340,9 +77122,9 @@ diff -urNp linux-2.6.32.45/scripts/mod/modpost.c linux-2.6.32.45/scripts/mod/mod
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.32.45/scripts/mod/modpost.h linux-2.6.32.45/scripts/mod/modpost.h
---- linux-2.6.32.45/scripts/mod/modpost.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/mod/modpost.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/mod/modpost.h linux-2.6.32.46/scripts/mod/modpost.h
+--- linux-2.6.32.46/scripts/mod/modpost.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/mod/modpost.h	2011-04-17 15:56:46.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -74362,9 +77144,9 @@ diff -urNp linux-2.6.32.45/scripts/mod/modpost.h linux-2.6.32.45/scripts/mod/mod
  
  struct module {
  	struct module *next;
-diff -urNp linux-2.6.32.45/scripts/mod/sumversion.c linux-2.6.32.45/scripts/mod/sumversion.c
---- linux-2.6.32.45/scripts/mod/sumversion.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/mod/sumversion.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/mod/sumversion.c linux-2.6.32.46/scripts/mod/sumversion.c
+--- linux-2.6.32.46/scripts/mod/sumversion.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/mod/sumversion.c	2011-04-17 15:56:46.000000000 -0400
 @@ -455,7 +455,7 @@ static void write_version(const char *fi
  		goto out;
  	}
@@ -74374,9 +77156,9 @@ diff -urNp linux-2.6.32.45/scripts/mod/sumversion.c linux-2.6.32.45/scripts/mod/
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-2.6.32.45/scripts/package/mkspec linux-2.6.32.45/scripts/package/mkspec
---- linux-2.6.32.45/scripts/package/mkspec	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/package/mkspec	2011-07-19 18:19:12.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/package/mkspec linux-2.6.32.46/scripts/package/mkspec
+--- linux-2.6.32.46/scripts/package/mkspec	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/package/mkspec	2011-07-19 18:19:12.000000000 -0400
 @@ -70,7 +70,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM
  echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
  echo "%endif"
@@ -74386,9 +77168,9 @@ diff -urNp linux-2.6.32.45/scripts/package/mkspec linux-2.6.32.45/scripts/packag
  echo "%ifarch ia64"
  echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
  echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
-diff -urNp linux-2.6.32.45/scripts/pnmtologo.c linux-2.6.32.45/scripts/pnmtologo.c
---- linux-2.6.32.45/scripts/pnmtologo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/pnmtologo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/pnmtologo.c linux-2.6.32.46/scripts/pnmtologo.c
+--- linux-2.6.32.46/scripts/pnmtologo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/pnmtologo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -74415,9 +77197,9 @@ diff -urNp linux-2.6.32.45/scripts/pnmtologo.c linux-2.6.32.45/scripts/pnmtologo
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.32.45/scripts/tags.sh linux-2.6.32.45/scripts/tags.sh
---- linux-2.6.32.45/scripts/tags.sh	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/scripts/tags.sh	2011-06-07 18:06:04.000000000 -0400
+diff -urNp linux-2.6.32.46/scripts/tags.sh linux-2.6.32.46/scripts/tags.sh
+--- linux-2.6.32.46/scripts/tags.sh	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/tags.sh	2011-06-07 18:06:04.000000000 -0400
 @@ -93,6 +93,11 @@ docscope()
  	cscope -b -f cscope.out
  }
@@ -74441,9 +77223,9 @@ diff -urNp linux-2.6.32.45/scripts/tags.sh linux-2.6.32.45/scripts/tags.sh
  	"tags")
  		rm -f tags
  		xtags ctags
-diff -urNp linux-2.6.32.45/security/capability.c linux-2.6.32.45/security/capability.c
---- linux-2.6.32.45/security/capability.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/capability.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/capability.c linux-2.6.32.46/security/capability.c
+--- linux-2.6.32.46/security/capability.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/capability.c	2011-04-17 15:56:46.000000000 -0400
 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
  }
  #endif /* CONFIG_AUDIT */
@@ -74453,9 +77235,9 @@ diff -urNp linux-2.6.32.45/security/capability.c linux-2.6.32.45/security/capabi
  	.name	= "default",
  };
  
-diff -urNp linux-2.6.32.45/security/commoncap.c linux-2.6.32.45/security/commoncap.c
---- linux-2.6.32.45/security/commoncap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/commoncap.c	2011-08-17 19:22:13.000000000 -0400
+diff -urNp linux-2.6.32.46/security/commoncap.c linux-2.6.32.46/security/commoncap.c
+--- linux-2.6.32.46/security/commoncap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/commoncap.c	2011-08-17 19:22:13.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <linux/sched.h>
  #include <linux/prctl.h>
@@ -74494,9 +77276,9 @@ diff -urNp linux-2.6.32.45/security/commoncap.c linux-2.6.32.45/security/commonc
  	if (cred->uid != 0) {
  		if (bprm->cap_effective)
  			return 1;
-diff -urNp linux-2.6.32.45/security/integrity/ima/ima_api.c linux-2.6.32.45/security/integrity/ima/ima_api.c
---- linux-2.6.32.45/security/integrity/ima/ima_api.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/integrity/ima/ima_api.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima_api.c linux-2.6.32.46/security/integrity/ima/ima_api.c
+--- linux-2.6.32.46/security/integrity/ima/ima_api.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima_api.c	2011-04-17 15:56:46.000000000 -0400
 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
  	int result;
  
@@ -74506,9 +77288,9 @@ diff -urNp linux-2.6.32.45/security/integrity/ima/ima_api.c linux-2.6.32.45/secu
  
  	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  	if (!entry) {
-diff -urNp linux-2.6.32.45/security/integrity/ima/ima_fs.c linux-2.6.32.45/security/integrity/ima/ima_fs.c
---- linux-2.6.32.45/security/integrity/ima/ima_fs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/integrity/ima/ima_fs.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima_fs.c linux-2.6.32.46/security/integrity/ima/ima_fs.c
+--- linux-2.6.32.46/security/integrity/ima/ima_fs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima_fs.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,12 +27,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -74524,9 +77306,9 @@ diff -urNp linux-2.6.32.45/security/integrity/ima/ima_fs.c linux-2.6.32.45/secur
  	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-2.6.32.45/security/integrity/ima/ima.h linux-2.6.32.45/security/integrity/ima/ima.h
---- linux-2.6.32.45/security/integrity/ima/ima.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/integrity/ima/ima.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima.h linux-2.6.32.46/security/integrity/ima/ima.h
+--- linux-2.6.32.46/security/integrity/ima/ima.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima.h	2011-04-17 15:56:46.000000000 -0400
 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -74538,9 +77320,9 @@ diff -urNp linux-2.6.32.45/security/integrity/ima/ima.h linux-2.6.32.45/security
  	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.45/security/integrity/ima/ima_queue.c linux-2.6.32.45/security/integrity/ima/ima_queue.c
---- linux-2.6.32.45/security/integrity/ima/ima_queue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/integrity/ima/ima_queue.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima_queue.c linux-2.6.32.46/security/integrity/ima/ima_queue.c
+--- linux-2.6.32.46/security/integrity/ima/ima_queue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima_queue.c	2011-04-17 15:56:46.000000000 -0400
 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
  	INIT_LIST_HEAD(&qe->later);
  	list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -74550,9 +77332,9 @@ diff -urNp linux-2.6.32.45/security/integrity/ima/ima_queue.c linux-2.6.32.45/se
  	key = ima_hash_key(entry->digest);
  	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
  	return 0;
-diff -urNp linux-2.6.32.45/security/Kconfig linux-2.6.32.45/security/Kconfig
---- linux-2.6.32.45/security/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/Kconfig	2011-07-06 19:58:11.000000000 -0400
+diff -urNp linux-2.6.32.46/security/Kconfig linux-2.6.32.46/security/Kconfig
+--- linux-2.6.32.46/security/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/Kconfig	2011-07-06 19:58:11.000000000 -0400
 @@ -4,6 +4,555 @@
  
  menu "Security options"
@@ -75118,9 +77900,9 @@ diff -urNp linux-2.6.32.45/security/Kconfig linux-2.6.32.45/security/Kconfig
  	help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-2.6.32.45/security/keys/keyring.c linux-2.6.32.45/security/keys/keyring.c
---- linux-2.6.32.45/security/keys/keyring.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/keys/keyring.c	2011-04-18 22:03:00.000000000 -0400
+diff -urNp linux-2.6.32.46/security/keys/keyring.c linux-2.6.32.46/security/keys/keyring.c
+--- linux-2.6.32.46/security/keys/keyring.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/keys/keyring.c	2011-04-18 22:03:00.000000000 -0400
 @@ -214,15 +214,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
@@ -75140,9 +77922,9 @@ diff -urNp linux-2.6.32.45/security/keys/keyring.c linux-2.6.32.45/security/keys
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-2.6.32.45/security/min_addr.c linux-2.6.32.45/security/min_addr.c
---- linux-2.6.32.45/security/min_addr.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/min_addr.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/min_addr.c linux-2.6.32.46/security/min_addr.c
+--- linux-2.6.32.46/security/min_addr.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/min_addr.c	2011-04-17 15:56:46.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -75159,9 +77941,9 @@ diff -urNp linux-2.6.32.45/security/min_addr.c linux-2.6.32.45/security/min_addr
  }
  
  /*
-diff -urNp linux-2.6.32.45/security/root_plug.c linux-2.6.32.45/security/root_plug.c
---- linux-2.6.32.45/security/root_plug.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/root_plug.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/root_plug.c linux-2.6.32.46/security/root_plug.c
+--- linux-2.6.32.46/security/root_plug.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/root_plug.c	2011-04-17 15:56:46.000000000 -0400
 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security 
  	return 0;
  }
@@ -75171,9 +77953,9 @@ diff -urNp linux-2.6.32.45/security/root_plug.c linux-2.6.32.45/security/root_pl
  	.bprm_check_security =		rootplug_bprm_check_security,
  };
  
-diff -urNp linux-2.6.32.45/security/security.c linux-2.6.32.45/security/security.c
---- linux-2.6.32.45/security/security.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/security.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/security.c linux-2.6.32.46/security/security.c
+--- linux-2.6.32.46/security/security.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/security.c	2011-04-17 15:56:46.000000000 -0400
 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURI
  extern struct security_operations default_security_ops;
  extern void security_fixup_ops(struct security_operations *ops);
@@ -75192,9 +77974,9 @@ diff -urNp linux-2.6.32.45/security/security.c linux-2.6.32.45/security/security
  {
  	if (verify(ops)) {
  		printk(KERN_DEBUG "%s could not verify "
-diff -urNp linux-2.6.32.45/security/selinux/hooks.c linux-2.6.32.45/security/selinux/hooks.c
---- linux-2.6.32.45/security/selinux/hooks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/selinux/hooks.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/selinux/hooks.c linux-2.6.32.46/security/selinux/hooks.c
+--- linux-2.6.32.46/security/selinux/hooks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/selinux/hooks.c	2011-04-17 15:56:46.000000000 -0400
 @@ -131,7 +131,7 @@ int selinux_enabled = 1;
   * Minimal support for a secondary security module,
   * just to allow the use of the capability module.
@@ -75223,9 +78005,9 @@ diff -urNp linux-2.6.32.45/security/selinux/hooks.c linux-2.6.32.45/security/sel
  
  	/* Unregister netfilter hooks. */
  	selinux_nf_ip_exit();
-diff -urNp linux-2.6.32.45/security/selinux/include/xfrm.h linux-2.6.32.45/security/selinux/include/xfrm.h
---- linux-2.6.32.45/security/selinux/include/xfrm.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/selinux/include/xfrm.h	2011-05-18 20:09:37.000000000 -0400
+diff -urNp linux-2.6.32.46/security/selinux/include/xfrm.h linux-2.6.32.46/security/selinux/include/xfrm.h
+--- linux-2.6.32.46/security/selinux/include/xfrm.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/selinux/include/xfrm.h	2011-05-18 20:09:37.000000000 -0400
 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
@@ -75235,9 +78017,9 @@ diff -urNp linux-2.6.32.45/security/selinux/include/xfrm.h linux-2.6.32.45/secur
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-2.6.32.45/security/selinux/ss/services.c linux-2.6.32.45/security/selinux/ss/services.c
---- linux-2.6.32.45/security/selinux/ss/services.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/selinux/ss/services.c	2011-05-16 21:46:57.000000000 -0400
+diff -urNp linux-2.6.32.46/security/selinux/ss/services.c linux-2.6.32.46/security/selinux/ss/services.c
+--- linux-2.6.32.46/security/selinux/ss/services.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/selinux/ss/services.c	2011-05-16 21:46:57.000000000 -0400
 @@ -1715,6 +1715,8 @@ int security_load_policy(void *data, siz
  	int rc = 0;
  	struct policy_file file = { data, len }, *fp = &file;
@@ -75247,9 +78029,9 @@ diff -urNp linux-2.6.32.45/security/selinux/ss/services.c linux-2.6.32.45/securi
  	if (!ss_initialized) {
  		avtab_cache_init();
  		if (policydb_read(&policydb, fp)) {
-diff -urNp linux-2.6.32.45/security/smack/smack_lsm.c linux-2.6.32.45/security/smack/smack_lsm.c
---- linux-2.6.32.45/security/smack/smack_lsm.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/smack/smack_lsm.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/smack/smack_lsm.c linux-2.6.32.46/security/smack/smack_lsm.c
+--- linux-2.6.32.46/security/smack/smack_lsm.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/smack/smack_lsm.c	2011-04-17 15:56:46.000000000 -0400
 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
@@ -75259,9 +78041,9 @@ diff -urNp linux-2.6.32.45/security/smack/smack_lsm.c linux-2.6.32.45/security/s
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-2.6.32.45/security/tomoyo/tomoyo.c linux-2.6.32.45/security/tomoyo/tomoyo.c
---- linux-2.6.32.45/security/tomoyo/tomoyo.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/security/tomoyo/tomoyo.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/security/tomoyo/tomoyo.c linux-2.6.32.46/security/tomoyo/tomoyo.c
+--- linux-2.6.32.46/security/tomoyo/tomoyo.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/tomoyo/tomoyo.c	2011-04-17 15:56:46.000000000 -0400
 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct fil
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
@@ -75271,9 +78053,9 @@ diff -urNp linux-2.6.32.45/security/tomoyo/tomoyo.c linux-2.6.32.45/security/tom
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-2.6.32.45/sound/aoa/codecs/onyx.c linux-2.6.32.45/sound/aoa/codecs/onyx.c
---- linux-2.6.32.45/sound/aoa/codecs/onyx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/aoa/codecs/onyx.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/aoa/codecs/onyx.c linux-2.6.32.46/sound/aoa/codecs/onyx.c
+--- linux-2.6.32.46/sound/aoa/codecs/onyx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/aoa/codecs/onyx.c	2011-04-17 15:56:46.000000000 -0400
 @@ -53,7 +53,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -75302,9 +78084,9 @@ diff -urNp linux-2.6.32.45/sound/aoa/codecs/onyx.c linux-2.6.32.45/sound/aoa/cod
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-2.6.32.45/sound/aoa/codecs/onyx.h linux-2.6.32.45/sound/aoa/codecs/onyx.h
---- linux-2.6.32.45/sound/aoa/codecs/onyx.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/aoa/codecs/onyx.h	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/aoa/codecs/onyx.h linux-2.6.32.46/sound/aoa/codecs/onyx.h
+--- linux-2.6.32.46/sound/aoa/codecs/onyx.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/aoa/codecs/onyx.h	2011-04-17 15:56:46.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -75313,9 +78095,9 @@ diff -urNp linux-2.6.32.45/sound/aoa/codecs/onyx.h linux-2.6.32.45/sound/aoa/cod
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-2.6.32.45/sound/core/seq/seq_device.c linux-2.6.32.45/sound/core/seq/seq_device.c
---- linux-2.6.32.45/sound/core/seq/seq_device.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/core/seq/seq_device.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/core/seq/seq_device.c linux-2.6.32.46/sound/core/seq/seq_device.c
+--- linux-2.6.32.46/sound/core/seq/seq_device.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/core/seq/seq_device.c	2011-08-05 20:33:55.000000000 -0400
 @@ -63,7 +63,7 @@ struct ops_list {
  	int argsize;		/* argument size */
  
@@ -75352,9 +78134,9 @@ diff -urNp linux-2.6.32.45/sound/core/seq/seq_device.c linux-2.6.32.45/sound/cor
  		dev->status = SNDRV_SEQ_DEVICE_FREE;
  		dev->driver_data = NULL;
  		ops->num_init_devices--;
-diff -urNp linux-2.6.32.45/sound/drivers/mts64.c linux-2.6.32.45/sound/drivers/mts64.c
---- linux-2.6.32.45/sound/drivers/mts64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/drivers/mts64.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/drivers/mts64.c linux-2.6.32.46/sound/drivers/mts64.c
+--- linux-2.6.32.46/sound/drivers/mts64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/drivers/mts64.c	2011-04-17 15:56:46.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -75411,9 +78193,9 @@ diff -urNp linux-2.6.32.45/sound/drivers/mts64.c linux-2.6.32.45/sound/drivers/m
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/sound/drivers/opl4/opl4_lib.c linux-2.6.32.45/sound/drivers/opl4/opl4_lib.c
---- linux-2.6.32.45/sound/drivers/opl4/opl4_lib.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/drivers/opl4/opl4_lib.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c
+--- linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/drivers/opl4/opl4_lib.c	2011-08-05 20:33:55.000000000 -0400
 @@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
  MODULE_DESCRIPTION("OPL4 driver");
  MODULE_LICENSE("GPL");
@@ -75423,9 +78205,9 @@ diff -urNp linux-2.6.32.45/sound/drivers/opl4/opl4_lib.c linux-2.6.32.45/sound/d
  {
  	int timeout = 10;
  	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-2.6.32.45/sound/drivers/portman2x4.c linux-2.6.32.45/sound/drivers/portman2x4.c
---- linux-2.6.32.45/sound/drivers/portman2x4.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/drivers/portman2x4.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/drivers/portman2x4.c linux-2.6.32.46/sound/drivers/portman2x4.c
+--- linux-2.6.32.46/sound/drivers/portman2x4.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/drivers/portman2x4.c	2011-04-17 15:56:46.000000000 -0400
 @@ -46,6 +46,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -75443,9 +78225,9 @@ diff -urNp linux-2.6.32.45/sound/drivers/portman2x4.c linux-2.6.32.45/sound/driv
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-2.6.32.45/sound/isa/cmi8330.c linux-2.6.32.45/sound/isa/cmi8330.c
---- linux-2.6.32.45/sound/isa/cmi8330.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/isa/cmi8330.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/isa/cmi8330.c linux-2.6.32.46/sound/isa/cmi8330.c
+--- linux-2.6.32.46/sound/isa/cmi8330.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/isa/cmi8330.c	2011-08-23 21:22:32.000000000 -0400
 @@ -173,7 +173,7 @@ struct snd_cmi8330 {
  
  	struct snd_pcm *pcm;
@@ -75455,9 +78237,9 @@ diff -urNp linux-2.6.32.45/sound/isa/cmi8330.c linux-2.6.32.45/sound/isa/cmi8330
  		snd_pcm_open_callback_t open;
  		void *private_data; /* sb or wss */
  	} streams[2];
-diff -urNp linux-2.6.32.45/sound/oss/sb_audio.c linux-2.6.32.45/sound/oss/sb_audio.c
---- linux-2.6.32.45/sound/oss/sb_audio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/oss/sb_audio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/oss/sb_audio.c linux-2.6.32.46/sound/oss/sb_audio.c
+--- linux-2.6.32.46/sound/oss/sb_audio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/oss/sb_audio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -75467,9 +78249,9 @@ diff -urNp linux-2.6.32.45/sound/oss/sb_audio.c linux-2.6.32.45/sound/oss/sb_aud
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-2.6.32.45/sound/oss/swarm_cs4297a.c linux-2.6.32.45/sound/oss/swarm_cs4297a.c
---- linux-2.6.32.45/sound/oss/swarm_cs4297a.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/oss/swarm_cs4297a.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/oss/swarm_cs4297a.c linux-2.6.32.46/sound/oss/swarm_cs4297a.c
+--- linux-2.6.32.46/sound/oss/swarm_cs4297a.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/oss/swarm_cs4297a.c	2011-04-17 15:56:46.000000000 -0400
 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -75504,9 +78286,9 @@ diff -urNp linux-2.6.32.45/sound/oss/swarm_cs4297a.c linux-2.6.32.45/sound/oss/s
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_codec.c linux-2.6.32.45/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.45/sound/pci/ac97/ac97_codec.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/ac97/ac97_codec.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/ac97/ac97_codec.c linux-2.6.32.46/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.32.46/sound/pci/ac97/ac97_codec.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/ac97/ac97_codec.c	2011-04-17 15:56:46.000000000 -0400
 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
  }
  
@@ -75516,9 +78298,9 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_codec.c linux-2.6.32.45/sound/pci
  
  #ifdef CONFIG_SND_AC97_POWER_SAVE
  static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.45/sound/pci/ac97/ac97_patch.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/ac97/ac97_patch.c	2011-04-23 12:56:12.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/ac97/ac97_patch.c linux-2.6.32.46/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.32.46/sound/pci/ac97/ac97_patch.c	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/sound/pci/ac97/ac97_patch.c	2011-08-29 22:25:07.000000000 -0400
 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
  	return 0;
  }
@@ -75663,7 +78445,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1981a_specific,
  #ifdef CONFIG_PM
-@@ -1951,7 +1951,7 @@ static int patch_ad1981b_specific(struct
+@@ -1952,7 +1952,7 @@ static int patch_ad1981b_specific(struct
  				    ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
  }
  
@@ -75672,7 +78454,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1981b_specific,
  #ifdef CONFIG_PM
-@@ -2090,7 +2090,7 @@ static int patch_ad1888_specific(struct 
+@@ -2091,7 +2091,7 @@ static int patch_ad1888_specific(struct 
  	return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
  }
  
@@ -75681,7 +78463,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1888_specific,
  #ifdef CONFIG_PM
-@@ -2139,7 +2139,7 @@ static int patch_ad1980_specific(struct 
+@@ -2140,7 +2140,7 @@ static int patch_ad1980_specific(struct 
  	return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
  }
  
@@ -75690,7 +78472,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1980_specific,
  #ifdef CONFIG_PM
-@@ -2254,7 +2254,7 @@ static int patch_ad1985_specific(struct 
+@@ -2255,7 +2255,7 @@ static int patch_ad1985_specific(struct 
  				    ARRAY_SIZE(snd_ac97_ad1985_controls));
  }
  
@@ -75699,7 +78481,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1985_specific,
  #ifdef CONFIG_PM
-@@ -2546,7 +2546,7 @@ static int patch_ad1986_specific(struct 
+@@ -2547,7 +2547,7 @@ static int patch_ad1986_specific(struct 
  				    ARRAY_SIZE(snd_ac97_ad1985_controls));
  }
  
@@ -75708,7 +78490,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_post_spdif = patch_ad198x_post_spdif,
  	.build_specific = patch_ad1986_specific,
  #ifdef CONFIG_PM
-@@ -2651,7 +2651,7 @@ static int patch_alc650_specific(struct 
+@@ -2652,7 +2652,7 @@ static int patch_alc650_specific(struct 
  	return 0;
  }
  
@@ -75717,7 +78499,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_alc650_specific,
  	.update_jacks = alc650_update_jacks
  };
-@@ -2803,7 +2803,7 @@ static int patch_alc655_specific(struct 
+@@ -2804,7 +2804,7 @@ static int patch_alc655_specific(struct 
  	return 0;
  }
  
@@ -75726,7 +78508,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_alc655_specific,
  	.update_jacks = alc655_update_jacks
  };
-@@ -2915,7 +2915,7 @@ static int patch_alc850_specific(struct 
+@@ -2916,7 +2916,7 @@ static int patch_alc850_specific(struct 
  	return 0;
  }
  
@@ -75735,7 +78517,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_alc850_specific,
  	.update_jacks = alc850_update_jacks
  };
-@@ -2977,7 +2977,7 @@ static int patch_cm9738_specific(struct 
+@@ -2978,7 +2978,7 @@ static int patch_cm9738_specific(struct 
  	return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
  }
  
@@ -75744,7 +78526,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_cm9738_specific,
  	.update_jacks = cm9738_update_jacks
  };
-@@ -3068,7 +3068,7 @@ static int patch_cm9739_post_spdif(struc
+@@ -3069,7 +3069,7 @@ static int patch_cm9739_post_spdif(struc
  	return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
  }
  
@@ -75753,7 +78535,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_cm9739_specific,
  	.build_post_spdif = patch_cm9739_post_spdif,
  	.update_jacks = cm9739_update_jacks
-@@ -3242,7 +3242,7 @@ static int patch_cm9761_specific(struct 
+@@ -3243,7 +3243,7 @@ static int patch_cm9761_specific(struct 
  	return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
  }
  
@@ -75762,7 +78544,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_cm9761_specific,
  	.build_post_spdif = patch_cm9761_post_spdif,
  	.update_jacks = cm9761_update_jacks
-@@ -3338,7 +3338,7 @@ static int patch_cm9780_specific(struct 
+@@ -3339,7 +3339,7 @@ static int patch_cm9780_specific(struct 
  	return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
  }
  
@@ -75771,7 +78553,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_cm9780_specific,
  	.build_post_spdif = patch_cm9761_post_spdif	/* identical with CM9761 */
  };
-@@ -3458,7 +3458,7 @@ static int patch_vt1616_specific(struct 
+@@ -3459,7 +3459,7 @@ static int patch_vt1616_specific(struct 
  	return 0;
  }
  
@@ -75780,7 +78562,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_vt1616_specific
  };
  
-@@ -3812,7 +3812,7 @@ static int patch_it2646_specific(struct 
+@@ -3813,7 +3813,7 @@ static int patch_it2646_specific(struct 
  	return 0;
  }
  
@@ -75789,7 +78571,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_it2646_specific,
  	.update_jacks = it2646_update_jacks
  };
-@@ -3846,7 +3846,7 @@ static int patch_si3036_specific(struct 
+@@ -3847,7 +3847,7 @@ static int patch_si3036_specific(struct 
  	return 0;
  }
  
@@ -75798,7 +78580,7 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_si3036_specific,
  };
  
-@@ -3913,7 +3913,7 @@ static int patch_ucb1400_specific(struct
+@@ -3914,7 +3914,7 @@ static int patch_ucb1400_specific(struct
  	return 0;
  }
  
@@ -75807,9 +78589,9 @@ diff -urNp linux-2.6.32.45/sound/pci/ac97/ac97_patch.c linux-2.6.32.45/sound/pci
  	.build_specific	= patch_ucb1400_specific,
  };
  
-diff -urNp linux-2.6.32.45/sound/pci/hda/hda_codec.h linux-2.6.32.45/sound/pci/hda/hda_codec.h
---- linux-2.6.32.45/sound/pci/hda/hda_codec.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/hda/hda_codec.h	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/hda/hda_codec.h linux-2.6.32.46/sound/pci/hda/hda_codec.h
+--- linux-2.6.32.46/sound/pci/hda/hda_codec.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/hda/hda_codec.h	2011-08-23 21:22:32.000000000 -0400
 @@ -580,7 +580,7 @@ struct hda_bus_ops {
  	/* notify power-up/down from codec to controller */
  	void (*pm_notify)(struct hda_bus *bus);
@@ -75845,9 +78627,9 @@ diff -urNp linux-2.6.32.45/sound/pci/hda/hda_codec.h linux-2.6.32.45/sound/pci/h
  
  	/* PCM to create, set by patch_ops.build_pcms callback */
  	unsigned int num_pcms;
-diff -urNp linux-2.6.32.45/sound/pci/hda/patch_atihdmi.c linux-2.6.32.45/sound/pci/hda/patch_atihdmi.c
---- linux-2.6.32.45/sound/pci/hda/patch_atihdmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/hda/patch_atihdmi.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c
+--- linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/hda/patch_atihdmi.c	2011-08-05 20:33:55.000000000 -0400
 @@ -177,7 +177,7 @@ static int patch_atihdmi(struct hda_code
  	 */
  	spec->multiout.dig_out_nid = CVT_NID;
@@ -75857,9 +78639,9 @@ diff -urNp linux-2.6.32.45/sound/pci/hda/patch_atihdmi.c linux-2.6.32.45/sound/p
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.45/sound/pci/hda/patch_intelhdmi.c
---- linux-2.6.32.45/sound/pci/hda/patch_intelhdmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/hda/patch_intelhdmi.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c
+--- linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/hda/patch_intelhdmi.c	2011-08-05 20:33:55.000000000 -0400
 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
  		cp_ready);
  
@@ -75884,9 +78666,9 @@ diff -urNp linux-2.6.32.45/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.45/sound
  
  	snd_hda_eld_proc_new(codec, &spec->sink_eld);
  
-diff -urNp linux-2.6.32.45/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.45/sound/pci/hda/patch_nvhdmi.c
---- linux-2.6.32.45/sound/pci/hda/patch_nvhdmi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/hda/patch_nvhdmi.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c
+--- linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/hda/patch_nvhdmi.c	2011-08-05 20:33:55.000000000 -0400
 @@ -367,7 +367,7 @@ static int patch_nvhdmi_8ch(struct hda_c
  	spec->multiout.max_channels = 8;
  	spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
@@ -75905,9 +78687,9 @@ diff -urNp linux-2.6.32.45/sound/pci/hda/patch_nvhdmi.c linux-2.6.32.45/sound/pc
  
  	return 0;
  }
-diff -urNp linux-2.6.32.45/sound/pci/hda/patch_sigmatel.c linux-2.6.32.45/sound/pci/hda/patch_sigmatel.c
---- linux-2.6.32.45/sound/pci/hda/patch_sigmatel.c	2011-06-25 12:55:35.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/hda/patch_sigmatel.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c
+--- linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c	2011-06-25 12:55:35.000000000 -0400
++++ linux-2.6.32.46/sound/pci/hda/patch_sigmatel.c	2011-08-23 21:22:32.000000000 -0400
 @@ -5220,7 +5220,7 @@ again:
  	snd_hda_codec_write_cache(codec, nid, 0,
  			AC_VERB_SET_CONNECT_SEL, num_dacs);
@@ -75926,9 +78708,9 @@ diff -urNp linux-2.6.32.45/sound/pci/hda/patch_sigmatel.c linux-2.6.32.45/sound/
  	spec->num_pins = STAC92HD71BXX_NUM_PINS;
  	switch (codec->vendor_id) {
  	case 0x111d76b6:
-diff -urNp linux-2.6.32.45/sound/pci/ice1712/ice1712.h linux-2.6.32.45/sound/pci/ice1712/ice1712.h
---- linux-2.6.32.45/sound/pci/ice1712/ice1712.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/ice1712/ice1712.h	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/ice1712/ice1712.h linux-2.6.32.46/sound/pci/ice1712/ice1712.h
+--- linux-2.6.32.46/sound/pci/ice1712/ice1712.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/ice1712/ice1712.h	2011-08-05 20:33:55.000000000 -0400
 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
  	unsigned int mask_flags;	/* total mask bits */
  	struct snd_akm4xxx_ops {
@@ -75947,9 +78729,9 @@ diff -urNp linux-2.6.32.45/sound/pci/ice1712/ice1712.h linux-2.6.32.45/sound/pci
  };
  
  
-diff -urNp linux-2.6.32.45/sound/pci/intel8x0m.c linux-2.6.32.45/sound/pci/intel8x0m.c
---- linux-2.6.32.45/sound/pci/intel8x0m.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/intel8x0m.c	2011-04-23 12:56:12.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/intel8x0m.c linux-2.6.32.46/sound/pci/intel8x0m.c
+--- linux-2.6.32.46/sound/pci/intel8x0m.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/intel8x0m.c	2011-04-23 12:56:12.000000000 -0400
 @@ -1264,7 +1264,7 @@ static struct shortname_table {
  	{ 0x5455, "ALi M5455" },
  	{ 0x746d, "AMD AMD8111" },
@@ -75959,9 +78741,9 @@ diff -urNp linux-2.6.32.45/sound/pci/intel8x0m.c linux-2.6.32.45/sound/pci/intel
  };
  
  static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.32.45/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.45/sound/pci/ymfpci/ymfpci_main.c
---- linux-2.6.32.45/sound/pci/ymfpci/ymfpci_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/pci/ymfpci/ymfpci_main.c	2011-05-04 17:56:28.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c
+--- linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/pci/ymfpci/ymfpci_main.c	2011-05-04 17:56:28.000000000 -0400
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
  		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
  			break;
@@ -76002,9 +78784,9 @@ diff -urNp linux-2.6.32.45/sound/pci/ymfpci/ymfpci_main.c linux-2.6.32.45/sound/
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff -urNp linux-2.6.32.45/sound/soc/soc-core.c linux-2.6.32.45/sound/soc/soc-core.c
---- linux-2.6.32.45/sound/soc/soc-core.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/soc/soc-core.c	2011-08-23 21:22:32.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/soc/soc-core.c linux-2.6.32.46/sound/soc/soc-core.c
+--- linux-2.6.32.46/sound/soc/soc-core.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/soc/soc-core.c	2011-08-23 21:22:32.000000000 -0400
 @@ -609,7 +609,7 @@ static int soc_pcm_trigger(struct snd_pc
  }
  
@@ -76014,9 +78796,9 @@ diff -urNp linux-2.6.32.45/sound/soc/soc-core.c linux-2.6.32.45/sound/soc/soc-co
  	.open		= soc_pcm_open,
  	.close		= soc_codec_close,
  	.hw_params	= soc_pcm_hw_params,
-diff -urNp linux-2.6.32.45/sound/usb/usbaudio.c linux-2.6.32.45/sound/usb/usbaudio.c
---- linux-2.6.32.45/sound/usb/usbaudio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/sound/usb/usbaudio.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/sound/usb/usbaudio.c linux-2.6.32.46/sound/usb/usbaudio.c
+--- linux-2.6.32.46/sound/usb/usbaudio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/sound/usb/usbaudio.c	2011-08-05 20:33:55.000000000 -0400
 @@ -963,12 +963,12 @@ static int snd_usb_pcm_playback_trigger(
  	switch (cmd) {
  	case SNDRV_PCM_TRIGGER_START:
@@ -76078,19 +78860,23 @@ diff -urNp linux-2.6.32.45/sound/usb/usbaudio.c linux-2.6.32.45/sound/usb/usbaud
  			break;
  		}
  	}
-diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc/constify_plugin.c
---- linux-2.6.32.45/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/tools/gcc/constify_plugin.c	2011-08-27 07:42:35.000000000 -0400
-@@ -0,0 +1,289 @@
+diff -urNp linux-2.6.32.46/tools/gcc/constify_plugin.c linux-2.6.32.46/tools/gcc/constify_plugin.c
+--- linux-2.6.32.46/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/tools/gcc/constify_plugin.c	2011-08-30 18:19:52.000000000 -0400
+@@ -0,0 +1,293 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
++ * Copyright 2011 by PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2, or (at your option) v3
 + *
-+ * This gcc plugin constifies all structures which contain only function pointers and const fields.
++ * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
++ *
++ * Homepage:
++ * http://www.grsecurity.net/~ephox/const_plugin/
 + *
 + * Usage:
 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
-+ * $ gcc -fplugin=constify_plugin.so test.c  -O2
++ * $ gcc -fplugin=constify_plugin.so test.c -O2
 + */
 +
 +#include "gcc-plugin.h"
@@ -76106,7 +78892,7 @@ diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc
 +#include "function.h"
 +#include "tree-flow.h"
 +#include "plugin.h"
-+#include "diagnostic-core.h"
++#include "diagnostic.h"
 +//#include "c-tree.h"
 +
 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
@@ -76371,10 +79157,9 @@ diff -urNp linux-2.6.32.45/tools/gcc/constify_plugin.c linux-2.6.32.45/tools/gcc
 +
 +	return 0;
 +}
-Binary files linux-2.6.32.45/tools/gcc/constify_plugin.so and linux-2.6.32.45/tools/gcc/constify_plugin.so differ
-diff -urNp linux-2.6.32.45/tools/gcc/Makefile linux-2.6.32.45/tools/gcc/Makefile
---- linux-2.6.32.45/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/tools/gcc/Makefile	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/tools/gcc/Makefile linux-2.6.32.46/tools/gcc/Makefile
+--- linux-2.6.32.46/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/tools/gcc/Makefile	2011-08-05 20:33:55.000000000 -0400
 @@ -0,0 +1,12 @@
 +#CC := gcc
 +#PLUGIN_SOURCE_FILES := pax_plugin.c
@@ -76388,9 +79173,9 @@ diff -urNp linux-2.6.32.45/tools/gcc/Makefile linux-2.6.32.45/tools/gcc/Makefile
 +always := $(hostlibs-y)
 +stackleak_plugin-objs := stackleak_plugin.o
 +constify_plugin-objs := constify_plugin.o
-diff -urNp linux-2.6.32.45/tools/gcc/stackleak_plugin.c linux-2.6.32.45/tools/gcc/stackleak_plugin.c
---- linux-2.6.32.45/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.45/tools/gcc/stackleak_plugin.c	2011-08-23 20:24:26.000000000 -0400
+diff -urNp linux-2.6.32.46/tools/gcc/stackleak_plugin.c linux-2.6.32.46/tools/gcc/stackleak_plugin.c
+--- linux-2.6.32.46/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/tools/gcc/stackleak_plugin.c	2011-08-23 20:24:26.000000000 -0400
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -76635,10 +79420,9 @@ diff -urNp linux-2.6.32.45/tools/gcc/stackleak_plugin.c linux-2.6.32.45/tools/gc
 +
 +	return 0;
 +}
-Binary files linux-2.6.32.45/tools/gcc/stackleak_plugin.so and linux-2.6.32.45/tools/gcc/stackleak_plugin.so differ
-diff -urNp linux-2.6.32.45/usr/gen_init_cpio.c linux-2.6.32.45/usr/gen_init_cpio.c
---- linux-2.6.32.45/usr/gen_init_cpio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/usr/gen_init_cpio.c	2011-04-17 15:56:46.000000000 -0400
+diff -urNp linux-2.6.32.46/usr/gen_init_cpio.c linux-2.6.32.46/usr/gen_init_cpio.c
+--- linux-2.6.32.46/usr/gen_init_cpio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/usr/gen_init_cpio.c	2011-04-17 15:56:46.000000000 -0400
 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
@@ -76661,9 +79445,9 @@ diff -urNp linux-2.6.32.45/usr/gen_init_cpio.c linux-2.6.32.45/usr/gen_init_cpio
                 } else
                         break;
         }
-diff -urNp linux-2.6.32.45/virt/kvm/kvm_main.c linux-2.6.32.45/virt/kvm/kvm_main.c
---- linux-2.6.32.45/virt/kvm/kvm_main.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.45/virt/kvm/kvm_main.c	2011-08-05 20:33:55.000000000 -0400
+diff -urNp linux-2.6.32.46/virt/kvm/kvm_main.c linux-2.6.32.46/virt/kvm/kvm_main.c
+--- linux-2.6.32.46/virt/kvm/kvm_main.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/virt/kvm/kvm_main.c	2011-08-05 20:33:55.000000000 -0400
 @@ -2494,7 +2494,7 @@ asmlinkage void kvm_handle_fault_on_rebo
  	if (kvm_rebooting)
  		/* spin while reset goes on */
diff --git a/3.0.3/0000_README b/3.0.3/0000_README
index 9b93d16..b6f610b 100644
--- a/3.0.3/0000_README
+++ b/3.0.3/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-3.0.3-201108281458.patch
+Patch:	4420_grsecurity-2.2.2-3.0.4-201108301903.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch b/3.0.3/4420_grsecurity-2.2.2-3.0.4-201108301903.patch
index ea39dff..8d93a7b 100644
--- a/3.0.3/4420_grsecurity-2.2.2-3.0.3-201108281458.patch
+++ b/3.0.3/4420_grsecurity-2.2.2-3.0.4-201108301903.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-3.0.3/arch/alpha/include/asm/elf.h linux-3.0.3/arch/alpha/include/asm/elf.h
---- linux-3.0.3/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/include/asm/elf.h linux-3.0.4/arch/alpha/include/asm/elf.h
+--- linux-3.0.4/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-3.0.3/arch/alpha/include/asm/elf.h linux-3.0.3/arch/alpha/inclu
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-3.0.3/arch/alpha/include/asm/pgtable.h linux-3.0.3/arch/alpha/include/asm/pgtable.h
---- linux-3.0.3/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/include/asm/pgtable.h linux-3.0.4/arch/alpha/include/asm/pgtable.h
+--- linux-3.0.4/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-3.0.3/arch/alpha/include/asm/pgtable.h linux-3.0.3/arch/alpha/i
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-3.0.3/arch/alpha/kernel/module.c linux-3.0.3/arch/alpha/kernel/module.c
---- linux-3.0.3/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/kernel/module.c linux-3.0.4/arch/alpha/kernel/module.c
+--- linux-3.0.4/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-3.0.3/arch/alpha/kernel/module.c linux-3.0.3/arch/alpha/kernel/
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.3/arch/alpha/kernel/osf_sys.c linux-3.0.3/arch/alpha/kernel/osf_sys.c
---- linux-3.0.3/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/kernel/osf_sys.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel/osf_sys.c
+--- linux-3.0.4/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/kernel/osf_sys.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
@@ -82,9 +82,9 @@ diff -urNp linux-3.0.3/arch/alpha/kernel/osf_sys.c linux-3.0.3/arch/alpha/kernel
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-3.0.3/arch/alpha/mm/fault.c linux-3.0.3/arch/alpha/mm/fault.c
---- linux-3.0.3/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/arch/alpha/mm/fault.c
+--- linux-3.0.4/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
@@ -241,9 +241,9 @@ diff -urNp linux-3.0.3/arch/alpha/mm/fault.c linux-3.0.3/arch/alpha/mm/fault.c
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-3.0.3/arch/arm/include/asm/elf.h linux-3.0.3/arch/arm/include/asm/elf.h
---- linux-3.0.3/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/include/asm/elf.h linux-3.0.4/arch/arm/include/asm/elf.h
+--- linux-3.0.4/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -271,9 +271,9 @@ diff -urNp linux-3.0.3/arch/arm/include/asm/elf.h linux-3.0.3/arch/arm/include/a
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-3.0.3/arch/arm/include/asm/kmap_types.h linux-3.0.3/arch/arm/include/asm/kmap_types.h
---- linux-3.0.3/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/include/asm/kmap_types.h linux-3.0.4/arch/arm/include/asm/kmap_types.h
+--- linux-3.0.4/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -282,9 +282,9 @@ diff -urNp linux-3.0.3/arch/arm/include/asm/kmap_types.h linux-3.0.3/arch/arm/in
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/arm/include/asm/uaccess.h linux-3.0.3/arch/arm/include/asm/uaccess.h
---- linux-3.0.3/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/include/asm/uaccess.h linux-3.0.4/arch/arm/include/asm/uaccess.h
+--- linux-3.0.4/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -340,9 +340,9 @@ diff -urNp linux-3.0.3/arch/arm/include/asm/uaccess.h linux-3.0.3/arch/arm/inclu
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-3.0.3/arch/arm/kernel/armksyms.c linux-3.0.3/arch/arm/kernel/armksyms.c
---- linux-3.0.3/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/kernel/armksyms.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/kernel/armksyms.c linux-3.0.4/arch/arm/kernel/armksyms.c
+--- linux-3.0.4/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/kernel/armksyms.c	2011-08-23 21:47:55.000000000 -0400
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -354,9 +354,9 @@ diff -urNp linux-3.0.3/arch/arm/kernel/armksyms.c linux-3.0.3/arch/arm/kernel/ar
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3/arch/arm/kernel/process.c
---- linux-3.0.3/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4/arch/arm/kernel/process.c
+--- linux-3.0.4/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
@@ -378,9 +378,9 @@ diff -urNp linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3/arch/arm/kernel/pro
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3/arch/arm/kernel/traps.c
---- linux-3.0.3/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4/arch/arm/kernel/traps.c
+--- linux-3.0.4/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -400,9 +400,9 @@ diff -urNp linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3/arch/arm/kernel/traps
  	if (ret != NOTIFY_STOP)
  		do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.3/arch/arm/lib/copy_from_user.S linux-3.0.3/arch/arm/lib/copy_from_user.S
---- linux-3.0.3/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/copy_from_user.S linux-3.0.4/arch/arm/lib/copy_from_user.S
+--- linux-3.0.4/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -426,9 +426,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/copy_from_user.S linux-3.0.3/arch/arm/lib/co
  
  	.pushsection .fixup,"ax"
  	.align 0
-diff -urNp linux-3.0.3/arch/arm/lib/copy_to_user.S linux-3.0.3/arch/arm/lib/copy_to_user.S
---- linux-3.0.3/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/copy_to_user.S linux-3.0.4/arch/arm/lib/copy_to_user.S
+--- linux-3.0.4/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -452,9 +452,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/copy_to_user.S linux-3.0.3/arch/arm/lib/copy
  ENDPROC(__copy_to_user_std)
  
  	.pushsection .fixup,"ax"
-diff -urNp linux-3.0.3/arch/arm/lib/uaccess.S linux-3.0.3/arch/arm/lib/uaccess.S
---- linux-3.0.3/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/uaccess.S linux-3.0.4/arch/arm/lib/uaccess.S
+--- linux-3.0.4/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -508,9 +508,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/uaccess.S linux-3.0.3/arch/arm/lib/uaccess.S
  
  		.pushsection .fixup,"ax"
  		.align	0
-diff -urNp linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -520,9 +520,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.3/arch/arm/l
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c	2011-08-23 21:48:14.000000000 -0400
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -532,9 +532,9 @@ diff -urNp linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.3/arch/arm/ma
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.3/arch/arm/mm/fault.c linux-3.0.3/arch/arm/mm/fault.c
---- linux-3.0.3/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
+--- linux-3.0.4/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
@@ -583,9 +583,9 @@ diff -urNp linux-3.0.3/arch/arm/mm/fault.c linux-3.0.3/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.3/arch/arm/mm/mmap.c linux-3.0.3/arch/arm/mm/mmap.c
---- linux-3.0.3/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/mm/mmap.c linux-3.0.4/arch/arm/mm/mmap.c
+--- linux-3.0.4/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
@@ -635,9 +635,9 @@ diff -urNp linux-3.0.3/arch/arm/mm/mmap.c linux-3.0.3/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-3.0.3/arch/avr32/include/asm/elf.h linux-3.0.3/arch/avr32/include/asm/elf.h
---- linux-3.0.3/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/avr32/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/avr32/include/asm/elf.h linux-3.0.4/arch/avr32/include/asm/elf.h
+--- linux-3.0.4/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/avr32/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -654,9 +654,9 @@ diff -urNp linux-3.0.3/arch/avr32/include/asm/elf.h linux-3.0.3/arch/avr32/inclu
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-3.0.3/arch/avr32/include/asm/kmap_types.h linux-3.0.3/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.3/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/avr32/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/avr32/include/asm/kmap_types.h linux-3.0.4/arch/avr32/include/asm/kmap_types.h
+--- linux-3.0.4/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/avr32/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -667,9 +667,9 @@ diff -urNp linux-3.0.3/arch/avr32/include/asm/kmap_types.h linux-3.0.3/arch/avr3
  };
  
  #undef D
-diff -urNp linux-3.0.3/arch/avr32/mm/fault.c linux-3.0.3/arch/avr32/mm/fault.c
---- linux-3.0.3/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/avr32/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/avr32/mm/fault.c linux-3.0.4/arch/avr32/mm/fault.c
+--- linux-3.0.4/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/avr32/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -711,9 +711,9 @@ diff -urNp linux-3.0.3/arch/avr32/mm/fault.c linux-3.0.3/arch/avr32/mm/fault.c
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-3.0.3/arch/frv/include/asm/kmap_types.h linux-3.0.3/arch/frv/include/asm/kmap_types.h
---- linux-3.0.3/arch/frv/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/frv/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/frv/include/asm/kmap_types.h linux-3.0.4/arch/frv/include/asm/kmap_types.h
+--- linux-3.0.4/arch/frv/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/frv/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -722,9 +722,9 @@ diff -urNp linux-3.0.3/arch/frv/include/asm/kmap_types.h linux-3.0.3/arch/frv/in
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/frv/mm/elf-fdpic.c linux-3.0.3/arch/frv/mm/elf-fdpic.c
---- linux-3.0.3/arch/frv/mm/elf-fdpic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/frv/mm/elf-fdpic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/frv/mm/elf-fdpic.c linux-3.0.4/arch/frv/mm/elf-fdpic.c
+--- linux-3.0.4/arch/frv/mm/elf-fdpic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/frv/mm/elf-fdpic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
@@ -753,9 +753,9 @@ diff -urNp linux-3.0.3/arch/frv/mm/elf-fdpic.c linux-3.0.3/arch/frv/mm/elf-fdpic
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-3.0.3/arch/ia64/include/asm/elf.h linux-3.0.3/arch/ia64/include/asm/elf.h
---- linux-3.0.3/arch/ia64/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/elf.h linux-3.0.4/arch/ia64/include/asm/elf.h
+--- linux-3.0.4/arch/ia64/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -770,9 +770,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/elf.h linux-3.0.3/arch/ia64/include
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-3.0.3/arch/ia64/include/asm/pgtable.h linux-3.0.3/arch/ia64/include/asm/pgtable.h
---- linux-3.0.3/arch/ia64/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/pgtable.h linux-3.0.4/arch/ia64/include/asm/pgtable.h
+--- linux-3.0.4/arch/ia64/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -800,9 +800,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/pgtable.h linux-3.0.3/arch/ia64/inc
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-3.0.3/arch/ia64/include/asm/spinlock.h linux-3.0.3/arch/ia64/include/asm/spinlock.h
---- linux-3.0.3/arch/ia64/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/spinlock.h linux-3.0.4/arch/ia64/include/asm/spinlock.h
+--- linux-3.0.4/arch/ia64/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -812,9 +812,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/spinlock.h linux-3.0.3/arch/ia64/in
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.0.3/arch/ia64/include/asm/uaccess.h linux-3.0.3/arch/ia64/include/asm/uaccess.h
---- linux-3.0.3/arch/ia64/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/uaccess.h linux-3.0.4/arch/ia64/include/asm/uaccess.h
+--- linux-3.0.4/arch/ia64/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
@@ -833,9 +833,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/uaccess.h linux-3.0.3/arch/ia64/inc
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-3.0.3/arch/ia64/kernel/module.c linux-3.0.3/arch/ia64/kernel/module.c
---- linux-3.0.3/arch/ia64/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/module.c
+--- linux-3.0.4/arch/ia64/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -924,9 +924,9 @@ diff -urNp linux-3.0.3/arch/ia64/kernel/module.c linux-3.0.3/arch/ia64/kernel/mo
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-3.0.3/arch/ia64/kernel/sys_ia64.c linux-3.0.3/arch/ia64/kernel/sys_ia64.c
---- linux-3.0.3/arch/ia64/kernel/sys_ia64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/kernel/sys_ia64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/kernel/sys_ia64.c linux-3.0.4/arch/ia64/kernel/sys_ia64.c
+--- linux-3.0.4/arch/ia64/kernel/sys_ia64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/kernel/sys_ia64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
@@ -959,9 +959,9 @@ diff -urNp linux-3.0.3/arch/ia64/kernel/sys_ia64.c linux-3.0.3/arch/ia64/kernel/
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
 @@ -199,7 +199,7 @@ SECTIONS {
  	/* Per-cpu data: */
  	. = ALIGN(PERCPU_PAGE_SIZE);
@@ -971,9 +971,9 @@ diff -urNp linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S linux-3.0.3/arch/ia64/kern
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff -urNp linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3/arch/ia64/mm/fault.c
---- linux-3.0.3/arch/ia64/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4/arch/ia64/mm/fault.c
+--- linux-3.0.4/arch/ia64/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
@@ -1023,9 +1023,9 @@ diff -urNp linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3/arch/ia64/mm/fault.c
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
  	 * sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-3.0.3/arch/ia64/mm/hugetlbpage.c linux-3.0.3/arch/ia64/mm/hugetlbpage.c
---- linux-3.0.3/arch/ia64/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/mm/hugetlbpage.c linux-3.0.4/arch/ia64/mm/hugetlbpage.c
+--- linux-3.0.4/arch/ia64/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
  		/* At this point:  (!vmm || addr < vmm->vm_end). */
  		if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1035,9 +1035,9 @@ diff -urNp linux-3.0.3/arch/ia64/mm/hugetlbpage.c linux-3.0.3/arch/ia64/mm/huget
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-3.0.3/arch/ia64/mm/init.c linux-3.0.3/arch/ia64/mm/init.c
---- linux-3.0.3/arch/ia64/mm/init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/mm/init.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/mm/init.c linux-3.0.4/arch/ia64/mm/init.c
+--- linux-3.0.4/arch/ia64/mm/init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/mm/init.c	2011-08-23 21:47:55.000000000 -0400
 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1058,9 +1058,9 @@ diff -urNp linux-3.0.3/arch/ia64/mm/init.c linux-3.0.3/arch/ia64/mm/init.c
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-3.0.3/arch/m32r/lib/usercopy.c linux-3.0.3/arch/m32r/lib/usercopy.c
---- linux-3.0.3/arch/m32r/lib/usercopy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/m32r/lib/usercopy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/m32r/lib/usercopy.c linux-3.0.4/arch/m32r/lib/usercopy.c
+--- linux-3.0.4/arch/m32r/lib/usercopy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/m32r/lib/usercopy.c	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1081,9 +1081,9 @@ diff -urNp linux-3.0.3/arch/m32r/lib/usercopy.c linux-3.0.3/arch/m32r/lib/userco
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-3.0.3/arch/mips/include/asm/elf.h linux-3.0.3/arch/mips/include/asm/elf.h
---- linux-3.0.3/arch/mips/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/include/asm/elf.h linux-3.0.4/arch/mips/include/asm/elf.h
+--- linux-3.0.4/arch/mips/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1105,9 +1105,9 @@ diff -urNp linux-3.0.3/arch/mips/include/asm/elf.h linux-3.0.3/arch/mips/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-3.0.3/arch/mips/include/asm/page.h linux-3.0.3/arch/mips/include/asm/page.h
---- linux-3.0.3/arch/mips/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/include/asm/page.h linux-3.0.4/arch/mips/include/asm/page.h
+--- linux-3.0.4/arch/mips/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1117,9 +1117,9 @@ diff -urNp linux-3.0.3/arch/mips/include/asm/page.h linux-3.0.3/arch/mips/includ
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-3.0.3/arch/mips/include/asm/system.h linux-3.0.3/arch/mips/include/asm/system.h
---- linux-3.0.3/arch/mips/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/include/asm/system.h linux-3.0.4/arch/mips/include/asm/system.h
+--- linux-3.0.4/arch/mips/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1128,9 +1128,9 @@ diff -urNp linux-3.0.3/arch/mips/include/asm/system.h linux-3.0.3/arch/mips/incl
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1145,9 +1145,9 @@ diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c linux-3.0.3/arch/mips/ke
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c
---- linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1162,9 +1162,9 @@ diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c linux-3.0.3/arch/mips/ke
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-3.0.3/arch/mips/kernel/process.c linux-3.0.3/arch/mips/kernel/process.c
---- linux-3.0.3/arch/mips/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/kernel/process.c linux-3.0.4/arch/mips/kernel/process.c
+--- linux-3.0.4/arch/mips/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
@@ -1181,9 +1181,9 @@ diff -urNp linux-3.0.3/arch/mips/kernel/process.c linux-3.0.3/arch/mips/kernel/p
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-3.0.3/arch/mips/mm/fault.c linux-3.0.3/arch/mips/mm/fault.c
---- linux-3.0.3/arch/mips/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/mm/fault.c linux-3.0.4/arch/mips/mm/fault.c
+--- linux-3.0.4/arch/mips/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -28,6 +28,23 @@
  #include <asm/highmem.h>		/* For VMALLOC_END */
  #include <linux/kdebug.h>
@@ -1208,9 +1208,9 @@ diff -urNp linux-3.0.3/arch/mips/mm/fault.c linux-3.0.3/arch/mips/mm/fault.c
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-3.0.3/arch/mips/mm/mmap.c linux-3.0.3/arch/mips/mm/mmap.c
---- linux-3.0.3/arch/mips/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
+--- linux-3.0.4/arch/mips/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
 @@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
@@ -1272,9 +1272,9 @@ diff -urNp linux-3.0.3/arch/mips/mm/mmap.c linux-3.0.3/arch/mips/mm/mmap.c
 -
 -	return ret;
 -}
-diff -urNp linux-3.0.3/arch/parisc/include/asm/elf.h linux-3.0.3/arch/parisc/include/asm/elf.h
---- linux-3.0.3/arch/parisc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/include/asm/elf.h linux-3.0.4/arch/parisc/include/asm/elf.h
+--- linux-3.0.4/arch/parisc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1289,9 +1289,9 @@ diff -urNp linux-3.0.3/arch/parisc/include/asm/elf.h linux-3.0.3/arch/parisc/inc
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-3.0.3/arch/parisc/include/asm/pgtable.h linux-3.0.3/arch/parisc/include/asm/pgtable.h
---- linux-3.0.3/arch/parisc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/include/asm/pgtable.h linux-3.0.4/arch/parisc/include/asm/pgtable.h
+--- linux-3.0.4/arch/parisc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -210,6 +210,17 @@ struct vm_area_struct;
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1310,9 +1310,9 @@ diff -urNp linux-3.0.3/arch/parisc/include/asm/pgtable.h linux-3.0.3/arch/parisc
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL_EXEC)
  #define PAGE_KERNEL_RWX	__pgprot(_PAGE_KERNEL_RWX)
-diff -urNp linux-3.0.3/arch/parisc/kernel/module.c linux-3.0.3/arch/parisc/kernel/module.c
---- linux-3.0.3/arch/parisc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kernel/module.c
+--- linux-3.0.4/arch/parisc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -98,16 +98,38 @@
  
  /* three functions to determine where in the module core
@@ -1413,9 +1413,9 @@ diff -urNp linux-3.0.3/arch/parisc/kernel/module.c linux-3.0.3/arch/parisc/kerne
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-3.0.3/arch/parisc/kernel/sys_parisc.c linux-3.0.3/arch/parisc/kernel/sys_parisc.c
---- linux-3.0.3/arch/parisc/kernel/sys_parisc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/kernel/sys_parisc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/kernel/sys_parisc.c linux-3.0.4/arch/parisc/kernel/sys_parisc.c
+--- linux-3.0.4/arch/parisc/kernel/sys_parisc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/kernel/sys_parisc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (TASK_SIZE - len < addr)
@@ -1443,9 +1443,9 @@ diff -urNp linux-3.0.3/arch/parisc/kernel/sys_parisc.c linux-3.0.3/arch/parisc/k
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3/arch/parisc/kernel/traps.c
---- linux-3.0.3/arch/parisc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4/arch/parisc/kernel/traps.c
+--- linux-3.0.4/arch/parisc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
@@ -1457,9 +1457,9 @@ diff -urNp linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3/arch/parisc/kernel
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3/arch/parisc/mm/fault.c
---- linux-3.0.3/arch/parisc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
+--- linux-3.0.4/arch/parisc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1629,9 +1629,9 @@ diff -urNp linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3/arch/parisc/mm/fault.c
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/elf.h linux-3.0.3/arch/powerpc/include/asm/elf.h
---- linux-3.0.3/arch/powerpc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/elf.h linux-3.0.4/arch/powerpc/include/asm/elf.h
+--- linux-3.0.4/arch/powerpc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -1664,9 +1664,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/elf.h linux-3.0.3/arch/powerpc/i
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/kmap_types.h linux-3.0.3/arch/powerpc/include/asm/kmap_types.h
---- linux-3.0.3/arch/powerpc/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/kmap_types.h linux-3.0.4/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.0.4/arch/powerpc/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -27,6 +27,7 @@ enum km_type {
  	KM_PPC_SYNC_PAGE,
  	KM_PPC_SYNC_ICACHE,
@@ -1675,9 +1675,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/kmap_types.h linux-3.0.3/arch/po
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/mman.h linux-3.0.3/arch/powerpc/include/asm/mman.h
---- linux-3.0.3/arch/powerpc/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/mman.h linux-3.0.4/arch/powerpc/include/asm/mman.h
+--- linux-3.0.4/arch/powerpc/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
  }
  #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
@@ -1687,9 +1687,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/mman.h linux-3.0.3/arch/powerpc/
  {
  	return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
  }
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/page_64.h linux-3.0.3/arch/powerpc/include/asm/page_64.h
---- linux-3.0.3/arch/powerpc/include/asm/page_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/page_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/page_64.h linux-3.0.4/arch/powerpc/include/asm/page_64.h
+--- linux-3.0.4/arch/powerpc/include/asm/page_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/page_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -155,15 +155,18 @@ do {						\
   * stack by default, so in the absence of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -1711,9 +1711,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/page_64.h linux-3.0.3/arch/power
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/page.h linux-3.0.3/arch/powerpc/include/asm/page.h
---- linux-3.0.3/arch/powerpc/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/page.h linux-3.0.4/arch/powerpc/include/asm/page.h
+--- linux-3.0.4/arch/powerpc/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -1736,9 +1736,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/page.h linux-3.0.3/arch/powerpc/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/pgtable.h linux-3.0.3/arch/powerpc/include/asm/pgtable.h
---- linux-3.0.3/arch/powerpc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/pgtable.h linux-3.0.4/arch/powerpc/include/asm/pgtable.h
+--- linux-3.0.4/arch/powerpc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -1747,9 +1747,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/pgtable.h linux-3.0.3/arch/power
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h
---- linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -1758,9 +1758,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h linux-3.0.3/arch/po
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/reg.h linux-3.0.3/arch/powerpc/include/asm/reg.h
---- linux-3.0.3/arch/powerpc/include/asm/reg.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/reg.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/reg.h linux-3.0.4/arch/powerpc/include/asm/reg.h
+--- linux-3.0.4/arch/powerpc/include/asm/reg.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/reg.h	2011-08-23 21:47:55.000000000 -0400
 @@ -209,6 +209,7 @@
  #define SPRN_DBCR	0x136	/* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR	0x012	/* Data Storage Interrupt Status Register */
@@ -1769,9 +1769,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/reg.h linux-3.0.3/arch/powerpc/i
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/system.h linux-3.0.3/arch/powerpc/include/asm/system.h
---- linux-3.0.3/arch/powerpc/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/system.h linux-3.0.4/arch/powerpc/include/asm/system.h
+--- linux-3.0.4/arch/powerpc/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
@@ -1781,9 +1781,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/system.h linux-3.0.3/arch/powerp
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/uaccess.h linux-3.0.3/arch/powerpc/include/asm/uaccess.h
---- linux-3.0.3/arch/powerpc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/uaccess.h linux-3.0.4/arch/powerpc/include/asm/uaccess.h
+--- linux-3.0.4/arch/powerpc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -1961,9 +1961,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/uaccess.h linux-3.0.3/arch/power
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S
---- linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S	2011-08-23 21:47:55.000000000 -0400
 @@ -567,6 +567,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
@@ -1982,9 +1982,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S linux-3.0.3/arch/pow
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S
---- linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S	2011-08-23 21:47:55.000000000 -0400
 @@ -956,10 +956,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
@@ -1997,9 +1997,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S linux-3.0.3/arch/pow
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-3.0.3/arch/powerpc/kernel/module_32.c linux-3.0.3/arch/powerpc/kernel/module_32.c
---- linux-3.0.3/arch/powerpc/kernel/module_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/module_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/module_32.c linux-3.0.4/arch/powerpc/kernel/module_32.c
+--- linux-3.0.4/arch/powerpc/kernel/module_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/module_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
  			me->arch.core_plt_section = i;
  	}
@@ -2029,9 +2029,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/module_32.c linux-3.0.3/arch/powerpc/
  
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
-diff -urNp linux-3.0.3/arch/powerpc/kernel/module.c linux-3.0.3/arch/powerpc/kernel/module.c
---- linux-3.0.3/arch/powerpc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/module.c linux-3.0.4/arch/powerpc/kernel/module.c
+--- linux-3.0.4/arch/powerpc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2071,9 +2071,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/module.c linux-3.0.3/arch/powerpc/ker
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3/arch/powerpc/kernel/process.c
---- linux-3.0.3/arch/powerpc/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/process.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/kernel/process.c
+--- linux-3.0.4/arch/powerpc/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/process.c	2011-08-23 21:48:14.000000000 -0400
 @@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
  	 * Lookup NIP late so we have the best change of getting the
  	 * above info out without failing
@@ -2166,9 +2166,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3/arch/powerpc/ke
 -
 -	return ret;
 -}
-diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_32.c linux-3.0.3/arch/powerpc/kernel/signal_32.c
---- linux-3.0.3/arch/powerpc/kernel/signal_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/signal_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_32.c linux-3.0.4/arch/powerpc/kernel/signal_32.c
+--- linux-3.0.4/arch/powerpc/kernel/signal_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/signal_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
@@ -2178,9 +2178,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_32.c linux-3.0.3/arch/powerpc/
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_64.c linux-3.0.3/arch/powerpc/kernel/signal_64.c
---- linux-3.0.3/arch/powerpc/kernel/signal_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/signal_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_64.c linux-3.0.4/arch/powerpc/kernel/signal_64.c
+--- linux-3.0.4/arch/powerpc/kernel/signal_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/signal_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
@@ -2190,9 +2190,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_64.c linux-3.0.3/arch/powerpc/
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3/arch/powerpc/kernel/traps.c
---- linux-3.0.3/arch/powerpc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4/arch/powerpc/kernel/traps.c
+--- linux-3.0.4/arch/powerpc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
  static inline void pmac_backlight_unblank(void) { }
  #endif
@@ -2211,9 +2211,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3/arch/powerpc/kern
  	oops_exit();
  	do_exit(err);
  
-diff -urNp linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3/arch/powerpc/kernel/vdso.c
---- linux-3.0.3/arch/powerpc/kernel/vdso.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/vdso.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4/arch/powerpc/kernel/vdso.c
+--- linux-3.0.4/arch/powerpc/kernel/vdso.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/vdso.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2240,9 +2240,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3/arch/powerpc/kerne
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-3.0.3/arch/powerpc/lib/usercopy_64.c linux-3.0.3/arch/powerpc/lib/usercopy_64.c
---- linux-3.0.3/arch/powerpc/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/lib/usercopy_64.c linux-3.0.4/arch/powerpc/lib/usercopy_64.c
+--- linux-3.0.4/arch/powerpc/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2274,9 +2274,9 @@ diff -urNp linux-3.0.3/arch/powerpc/lib/usercopy_64.c linux-3.0.3/arch/powerpc/l
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.3/arch/powerpc/mm/fault.c linux-3.0.3/arch/powerpc/mm/fault.c
---- linux-3.0.3/arch/powerpc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault.c
+--- linux-3.0.4/arch/powerpc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -32,6 +32,10 @@
  #include <linux/perf_event.h>
  #include <linux/magic.h>
@@ -2381,9 +2381,9 @@ diff -urNp linux-3.0.3/arch/powerpc/mm/fault.c linux-3.0.3/arch/powerpc/mm/fault
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-3.0.3/arch/powerpc/mm/mmap_64.c linux-3.0.3/arch/powerpc/mm/mmap_64.c
---- linux-3.0.3/arch/powerpc/mm/mmap_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/mm/mmap_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/mm/mmap_64.c linux-3.0.4/arch/powerpc/mm/mmap_64.c
+--- linux-3.0.4/arch/powerpc/mm/mmap_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/mm/mmap_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -2407,9 +2407,9 @@ diff -urNp linux-3.0.3/arch/powerpc/mm/mmap_64.c linux-3.0.3/arch/powerpc/mm/mma
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.3/arch/powerpc/mm/slice.c linux-3.0.3/arch/powerpc/mm/slice.c
---- linux-3.0.3/arch/powerpc/mm/slice.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/mm/slice.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/mm/slice.c linux-3.0.4/arch/powerpc/mm/slice.c
+--- linux-3.0.4/arch/powerpc/mm/slice.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/mm/slice.c	2011-08-23 21:47:55.000000000 -0400
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
@@ -2476,9 +2476,9 @@ diff -urNp linux-3.0.3/arch/powerpc/mm/slice.c linux-3.0.3/arch/powerpc/mm/slice
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-3.0.3/arch/s390/include/asm/elf.h linux-3.0.3/arch/s390/include/asm/elf.h
---- linux-3.0.3/arch/s390/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include/asm/elf.h
+--- linux-3.0.4/arch/s390/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -2504,9 +2504,9 @@ diff -urNp linux-3.0.3/arch/s390/include/asm/elf.h linux-3.0.3/arch/s390/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-3.0.3/arch/s390/include/asm/system.h linux-3.0.3/arch/s390/include/asm/system.h
---- linux-3.0.3/arch/s390/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/include/asm/system.h linux-3.0.4/arch/s390/include/asm/system.h
+--- linux-3.0.4/arch/s390/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
@@ -2516,9 +2516,9 @@ diff -urNp linux-3.0.3/arch/s390/include/asm/system.h linux-3.0.3/arch/s390/incl
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-3.0.3/arch/s390/include/asm/uaccess.h linux-3.0.3/arch/s390/include/asm/uaccess.h
---- linux-3.0.3/arch/s390/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/include/asm/uaccess.h linux-3.0.4/arch/s390/include/asm/uaccess.h
+--- linux-3.0.4/arch/s390/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -235,6 +235,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -2551,9 +2551,9 @@ diff -urNp linux-3.0.3/arch/s390/include/asm/uaccess.h linux-3.0.3/arch/s390/inc
  	if (unlikely(sz != -1 && sz < n)) {
  		copy_from_user_overflow();
  		return n;
-diff -urNp linux-3.0.3/arch/s390/kernel/module.c linux-3.0.3/arch/s390/kernel/module.c
---- linux-3.0.3/arch/s390/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/module.c
+--- linux-3.0.4/arch/s390/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
@@ -2625,9 +2625,9 @@ diff -urNp linux-3.0.3/arch/s390/kernel/module.c linux-3.0.3/arch/s390/kernel/mo
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-3.0.3/arch/s390/kernel/process.c linux-3.0.3/arch/s390/kernel/process.c
---- linux-3.0.3/arch/s390/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/kernel/process.c linux-3.0.4/arch/s390/kernel/process.c
+--- linux-3.0.4/arch/s390/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
  	}
  	return 0;
@@ -2668,9 +2668,9 @@ diff -urNp linux-3.0.3/arch/s390/kernel/process.c linux-3.0.3/arch/s390/kernel/p
 -		return base;
 -	return ret;
 -}
-diff -urNp linux-3.0.3/arch/s390/kernel/setup.c linux-3.0.3/arch/s390/kernel/setup.c
---- linux-3.0.3/arch/s390/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/kernel/setup.c linux-3.0.4/arch/s390/kernel/setup.c
+--- linux-3.0.4/arch/s390/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -2680,9 +2680,9 @@ diff -urNp linux-3.0.3/arch/s390/kernel/setup.c linux-3.0.3/arch/s390/kernel/set
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-diff -urNp linux-3.0.3/arch/s390/mm/mmap.c linux-3.0.3/arch/s390/mm/mmap.c
---- linux-3.0.3/arch/s390/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/mm/mmap.c linux-3.0.4/arch/s390/mm/mmap.c
+--- linux-3.0.4/arch/s390/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
@@ -2729,9 +2729,9 @@ diff -urNp linux-3.0.3/arch/s390/mm/mmap.c linux-3.0.3/arch/s390/mm/mmap.c
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.3/arch/score/include/asm/system.h linux-3.0.3/arch/score/include/asm/system.h
---- linux-3.0.3/arch/score/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/score/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/score/include/asm/system.h linux-3.0.4/arch/score/include/asm/system.h
+--- linux-3.0.4/arch/score/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/score/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -2741,9 +2741,9 @@ diff -urNp linux-3.0.3/arch/score/include/asm/system.h linux-3.0.3/arch/score/in
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-3.0.3/arch/score/kernel/process.c linux-3.0.3/arch/score/kernel/process.c
---- linux-3.0.3/arch/score/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/score/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/score/kernel/process.c linux-3.0.4/arch/score/kernel/process.c
+--- linux-3.0.4/arch/score/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/score/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
@@ -2753,9 +2753,9 @@ diff -urNp linux-3.0.3/arch/score/kernel/process.c linux-3.0.3/arch/score/kernel
 -{
 -	return sp;
 -}
-diff -urNp linux-3.0.3/arch/sh/mm/mmap.c linux-3.0.3/arch/sh/mm/mmap.c
---- linux-3.0.3/arch/sh/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sh/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sh/mm/mmap.c linux-3.0.4/arch/sh/mm/mmap.c
+--- linux-3.0.4/arch/sh/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sh/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
@@ -2830,9 +2830,9 @@ diff -urNp linux-3.0.3/arch/sh/mm/mmap.c linux-3.0.3/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-3.0.3/arch/sparc/include/asm/atomic_64.h linux-3.0.3/arch/sparc/include/asm/atomic_64.h
---- linux-3.0.3/arch/sparc/include/asm/atomic_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/atomic_64.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc/include/asm/atomic_64.h
+--- linux-3.0.4/arch/sparc/include/asm/atomic_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/atomic_64.h	2011-08-23 21:48:14.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -3025,9 +3025,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/atomic_64.h linux-3.0.3/arch/sparc
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.3/arch/sparc/include/asm/cache.h linux-3.0.3/arch/sparc/include/asm/cache.h
---- linux-3.0.3/arch/sparc/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/cache.h linux-3.0.4/arch/sparc/include/asm/cache.h
+--- linux-3.0.4/arch/sparc/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,7 +10,7 @@
  #define ARCH_SLAB_MINALIGN	__alignof__(unsigned long long)
  
@@ -3037,9 +3037,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/cache.h linux-3.0.3/arch/sparc/inc
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_32.h linux-3.0.3/arch/sparc/include/asm/elf_32.h
---- linux-3.0.3/arch/sparc/include/asm/elf_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/elf_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_32.h linux-3.0.4/arch/sparc/include/asm/elf_32.h
+--- linux-3.0.4/arch/sparc/include/asm/elf_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/elf_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3054,9 +3054,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_32.h linux-3.0.3/arch/sparc/in
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_64.h linux-3.0.3/arch/sparc/include/asm/elf_64.h
---- linux-3.0.3/arch/sparc/include/asm/elf_64.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/elf_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/include/asm/elf_64.h
+--- linux-3.0.4/arch/sparc/include/asm/elf_64.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/elf_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -180,6 +180,13 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
@@ -3071,9 +3071,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_64.h linux-3.0.3/arch/sparc/in
  extern unsigned long sparc64_elf_hwcap;
  #define ELF_HWCAP	sparc64_elf_hwcap
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtable_32.h linux-3.0.3/arch/sparc/include/asm/pgtable_32.h
---- linux-3.0.3/arch/sparc/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.0.4/arch/sparc/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3105,9 +3105,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtable_32.h linux-3.0.3/arch/spar
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h
---- linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h	2011-08-23 21:47:55.000000000 -0400
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3122,9 +3122,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.3/arch/sparc/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/spinlock_64.h linux-3.0.3/arch/sparc/include/asm/spinlock_64.h
---- linux-3.0.3/arch/sparc/include/asm/spinlock_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/spinlock_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/spinlock_64.h linux-3.0.4/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.0.4/arch/sparc/include/asm/spinlock_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/spinlock_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -3222,9 +3222,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/spinlock_64.h linux-3.0.3/arch/spa
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_32.h linux-3.0.3/arch/sparc/include/asm/thread_info_32.h
---- linux-3.0.3/arch/sparc/include/asm/thread_info_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/thread_info_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_32.h linux-3.0.4/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.0.4/arch/sparc/include/asm/thread_info_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/thread_info_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -50,6 +50,8 @@ struct thread_info {
  	unsigned long		w_saved;
  
@@ -3234,9 +3234,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_32.h linux-3.0.3/arch/
  };
  
  /*
-diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_64.h linux-3.0.3/arch/sparc/include/asm/thread_info_64.h
---- linux-3.0.3/arch/sparc/include/asm/thread_info_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/thread_info_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_64.h linux-3.0.4/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.0.4/arch/sparc/include/asm/thread_info_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/thread_info_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -63,6 +63,8 @@ struct thread_info {
  	struct pt_regs		*kern_una_regs;
  	unsigned int		kern_una_insn;
@@ -3246,9 +3246,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_64.h linux-3.0.3/arch/
  	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_32.h linux-3.0.3/arch/sparc/include/asm/uaccess_32.h
---- linux-3.0.3/arch/sparc/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/uaccess_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_32.h linux-3.0.4/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.0.4/arch/sparc/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/uaccess_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3300,9 +3300,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_32.h linux-3.0.3/arch/spar
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_64.h linux-3.0.3/arch/sparc/include/asm/uaccess_64.h
---- linux-3.0.3/arch/sparc/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/uaccess_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_64.h linux-3.0.4/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.0.4/arch/sparc/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/uaccess_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3345,9 +3345,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_64.h linux-3.0.3/arch/spar
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess.h linux-3.0.3/arch/sparc/include/asm/uaccess.h
---- linux-3.0.3/arch/sparc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess.h linux-3.0.4/arch/sparc/include/asm/uaccess.h
+--- linux-3.0.4/arch/sparc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -3362,9 +3362,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess.h linux-3.0.3/arch/sparc/i
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-3.0.3/arch/sparc/kernel/Makefile linux-3.0.3/arch/sparc/kernel/Makefile
---- linux-3.0.3/arch/sparc/kernel/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/Makefile linux-3.0.4/arch/sparc/kernel/Makefile
+--- linux-3.0.4/arch/sparc/kernel/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -3374,9 +3374,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/Makefile linux-3.0.3/arch/sparc/kernel/
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-3.0.3/arch/sparc/kernel/process_32.c linux-3.0.3/arch/sparc/kernel/process_32.c
---- linux-3.0.3/arch/sparc/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/process_32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/process_32.c linux-3.0.4/arch/sparc/kernel/process_32.c
+--- linux-3.0.4/arch/sparc/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/process_32.c	2011-08-23 21:48:14.000000000 -0400
 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
@@ -3412,9 +3412,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/process_32.c linux-3.0.3/arch/sparc/ker
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-3.0.3/arch/sparc/kernel/process_64.c linux-3.0.3/arch/sparc/kernel/process_64.c
---- linux-3.0.3/arch/sparc/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/process_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/process_64.c linux-3.0.4/arch/sparc/kernel/process_64.c
+--- linux-3.0.4/arch/sparc/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/process_64.c	2011-08-23 21:48:14.000000000 -0400
 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
  	printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
  	       rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -3450,9 +3450,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/process_64.c linux-3.0.3/arch/sparc/ker
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c
---- linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
@@ -3471,9 +3471,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c linux-3.0.3/arch/sparc/k
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c
---- linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
@@ -3621,9 +3621,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c linux-3.0.3/arch/sparc/k
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.3/arch/sparc/kernel/traps_32.c linux-3.0.3/arch/sparc/kernel/traps_32.c
---- linux-3.0.3/arch/sparc/kernel/traps_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/traps_32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/traps_32.c linux-3.0.4/arch/sparc/kernel/traps_32.c
+--- linux-3.0.4/arch/sparc/kernel/traps_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/traps_32.c	2011-08-23 21:48:14.000000000 -0400
 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
  #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
  #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -3653,9 +3653,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/traps_32.c linux-3.0.3/arch/sparc/kerne
  	do_exit(SIGSEGV);
  }
  
-diff -urNp linux-3.0.3/arch/sparc/kernel/traps_64.c linux-3.0.3/arch/sparc/kernel/traps_64.c
---- linux-3.0.3/arch/sparc/kernel/traps_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/traps_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/traps_64.c linux-3.0.4/arch/sparc/kernel/traps_64.c
+--- linux-3.0.4/arch/sparc/kernel/traps_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/traps_64.c	2011-08-23 21:48:14.000000000 -0400
 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
  		       i + 1,
  		       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -3793,9 +3793,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/traps_64.c linux-3.0.3/arch/sparc/kerne
  	do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-3.0.3/arch/sparc/kernel/unaligned_64.c linux-3.0.3/arch/sparc/kernel/unaligned_64.c
---- linux-3.0.3/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/unaligned_64.c linux-3.0.4/arch/sparc/kernel/unaligned_64.c
+--- linux-3.0.4/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:48:14.000000000 -0400
 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
  	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
@@ -3805,9 +3805,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/unaligned_64.c linux-3.0.3/arch/sparc/k
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-3.0.3/arch/sparc/lib/atomic_64.S linux-3.0.3/arch/sparc/lib/atomic_64.S
---- linux-3.0.3/arch/sparc/lib/atomic_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/lib/atomic_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/lib/atomic_64.S linux-3.0.4/arch/sparc/lib/atomic_64.S
+--- linux-3.0.4/arch/sparc/lib/atomic_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/lib/atomic_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -4042,9 +4042,9 @@ diff -urNp linux-3.0.3/arch/sparc/lib/atomic_64.S linux-3.0.3/arch/sparc/lib/ato
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-3.0.3/arch/sparc/lib/ksyms.c linux-3.0.3/arch/sparc/lib/ksyms.c
---- linux-3.0.3/arch/sparc/lib/ksyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/lib/ksyms.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/lib/ksyms.c linux-3.0.4/arch/sparc/lib/ksyms.c
+--- linux-3.0.4/arch/sparc/lib/ksyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/lib/ksyms.c	2011-08-23 21:48:14.000000000 -0400
 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4064,9 +4064,9 @@ diff -urNp linux-3.0.3/arch/sparc/lib/ksyms.c linux-3.0.3/arch/sparc/lib/ksyms.c
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-3.0.3/arch/sparc/lib/Makefile linux-3.0.3/arch/sparc/lib/Makefile
---- linux-3.0.3/arch/sparc/lib/Makefile	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/sparc/lib/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/lib/Makefile linux-3.0.4/arch/sparc/lib/Makefile
+--- linux-3.0.4/arch/sparc/lib/Makefile	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/sparc/lib/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -4076,9 +4076,9 @@ diff -urNp linux-3.0.3/arch/sparc/lib/Makefile linux-3.0.3/arch/sparc/lib/Makefi
  
  lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
  lib-$(CONFIG_SPARC32) += memcpy.o memset.o
-diff -urNp linux-3.0.3/arch/sparc/Makefile linux-3.0.3/arch/sparc/Makefile
---- linux-3.0.3/arch/sparc/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/Makefile	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/Makefile linux-3.0.4/arch/sparc/Makefile
+--- linux-3.0.4/arch/sparc/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/Makefile	2011-08-23 21:48:14.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4088,9 +4088,9 @@ diff -urNp linux-3.0.3/arch/sparc/Makefile linux-3.0.3/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-3.0.3/arch/sparc/mm/fault_32.c linux-3.0.3/arch/sparc/mm/fault_32.c
---- linux-3.0.3/arch/sparc/mm/fault_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/fault_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_32.c
+--- linux-3.0.4/arch/sparc/mm/fault_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/fault_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4395,9 +4395,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/fault_32.c linux-3.0.3/arch/sparc/mm/fault_
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-3.0.3/arch/sparc/mm/fault_64.c linux-3.0.3/arch/sparc/mm/fault_64.c
---- linux-3.0.3/arch/sparc/mm/fault_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/fault_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_64.c
+--- linux-3.0.4/arch/sparc/mm/fault_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/fault_64.c	2011-08-23 21:48:14.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -4905,9 +4905,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/fault_64.c linux-3.0.3/arch/sparc/mm/fault_
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-3.0.3/arch/sparc/mm/hugetlbpage.c linux-3.0.3/arch/sparc/mm/hugetlbpage.c
---- linux-3.0.3/arch/sparc/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/hugetlbpage.c linux-3.0.4/arch/sparc/mm/hugetlbpage.c
+--- linux-3.0.4/arch/sparc/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
 @@ -68,7 +68,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -4967,9 +4967,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/hugetlbpage.c linux-3.0.3/arch/sparc/mm/hug
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.3/arch/sparc/mm/init_32.c linux-3.0.3/arch/sparc/mm/init_32.c
---- linux-3.0.3/arch/sparc/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/init_32.c linux-3.0.4/arch/sparc/mm/init_32.c
+--- linux-3.0.4/arch/sparc/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -316,6 +316,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5004,9 +5004,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/init_32.c linux-3.0.3/arch/sparc/mm/init_32
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-3.0.3/arch/sparc/mm/Makefile linux-3.0.3/arch/sparc/mm/Makefile
---- linux-3.0.3/arch/sparc/mm/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/Makefile linux-3.0.4/arch/sparc/mm/Makefile
+--- linux-3.0.4/arch/sparc/mm/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -5016,9 +5016,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/Makefile linux-3.0.3/arch/sparc/mm/Makefile
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-3.0.3/arch/sparc/mm/srmmu.c linux-3.0.3/arch/sparc/mm/srmmu.c
---- linux-3.0.3/arch/sparc/mm/srmmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/srmmu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/srmmu.c linux-3.0.4/arch/sparc/mm/srmmu.c
+--- linux-3.0.4/arch/sparc/mm/srmmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/srmmu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5033,9 +5033,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/srmmu.c linux-3.0.3/arch/sparc/mm/srmmu.c
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-3.0.3/arch/um/include/asm/kmap_types.h linux-3.0.3/arch/um/include/asm/kmap_types.h
---- linux-3.0.3/arch/um/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/include/asm/kmap_types.h linux-3.0.4/arch/um/include/asm/kmap_types.h
+--- linux-3.0.4/arch/um/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -5044,9 +5044,9 @@ diff -urNp linux-3.0.3/arch/um/include/asm/kmap_types.h linux-3.0.3/arch/um/incl
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/um/include/asm/page.h linux-3.0.3/arch/um/include/asm/page.h
---- linux-3.0.3/arch/um/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/include/asm/page.h linux-3.0.4/arch/um/include/asm/page.h
+--- linux-3.0.4/arch/um/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -5057,9 +5057,9 @@ diff -urNp linux-3.0.3/arch/um/include/asm/page.h linux-3.0.3/arch/um/include/as
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-3.0.3/arch/um/kernel/process.c linux-3.0.3/arch/um/kernel/process.c
---- linux-3.0.3/arch/um/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/kernel/process.c linux-3.0.4/arch/um/kernel/process.c
+--- linux-3.0.4/arch/um/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -5083,9 +5083,9 @@ diff -urNp linux-3.0.3/arch/um/kernel/process.c linux-3.0.3/arch/um/kernel/proce
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-3.0.3/arch/um/sys-i386/syscalls.c linux-3.0.3/arch/um/sys-i386/syscalls.c
---- linux-3.0.3/arch/um/sys-i386/syscalls.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/sys-i386/syscalls.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/sys-i386/syscalls.c linux-3.0.4/arch/um/sys-i386/syscalls.c
+--- linux-3.0.4/arch/um/sys-i386/syscalls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/sys-i386/syscalls.c	2011-08-23 21:47:55.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5108,9 +5108,9 @@ diff -urNp linux-3.0.3/arch/um/sys-i386/syscalls.c linux-3.0.3/arch/um/sys-i386/
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-3.0.3/arch/x86/boot/bitops.h linux-3.0.3/arch/x86/boot/bitops.h
---- linux-3.0.3/arch/x86/boot/bitops.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/bitops.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/bitops.h linux-3.0.4/arch/x86/boot/bitops.h
+--- linux-3.0.4/arch/x86/boot/bitops.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/bitops.h	2011-08-23 21:47:55.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
@@ -5129,9 +5129,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/bitops.h linux-3.0.3/arch/x86/boot/bitops.h
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-3.0.3/arch/x86/boot/boot.h linux-3.0.3/arch/x86/boot/boot.h
---- linux-3.0.3/arch/x86/boot/boot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/boot.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/boot.h linux-3.0.4/arch/x86/boot/boot.h
+--- linux-3.0.4/arch/x86/boot/boot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/boot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5150,9 +5150,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/boot.h linux-3.0.3/arch/x86/boot/boot.h
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_32.S linux-3.0.3/arch/x86/boot/compressed/head_32.S
---- linux-3.0.3/arch/x86/boot/compressed/head_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/head_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_32.S linux-3.0.4/arch/x86/boot/compressed/head_32.S
+--- linux-3.0.4/arch/x86/boot/compressed/head_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/head_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -5181,9 +5181,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_32.S linux-3.0.3/arch/x86/b
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_64.S linux-3.0.3/arch/x86/boot/compressed/head_64.S
---- linux-3.0.3/arch/x86/boot/compressed/head_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/head_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_64.S linux-3.0.4/arch/x86/boot/compressed/head_64.S
+--- linux-3.0.4/arch/x86/boot/compressed/head_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/head_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -5202,9 +5202,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_64.S linux-3.0.3/arch/x86/b
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/Makefile linux-3.0.3/arch/x86/boot/compressed/Makefile
---- linux-3.0.3/arch/x86/boot/compressed/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/Makefile linux-3.0.4/arch/x86/boot/compressed/Makefile
+--- linux-3.0.4/arch/x86/boot/compressed/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
  KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -5215,9 +5215,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/Makefile linux-3.0.3/arch/x86/bo
  
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/misc.c linux-3.0.3/arch/x86/boot/compressed/misc.c
---- linux-3.0.3/arch/x86/boot/compressed/misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/misc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/misc.c linux-3.0.4/arch/x86/boot/compressed/misc.c
+--- linux-3.0.4/arch/x86/boot/compressed/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/misc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -5236,9 +5236,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/misc.c linux-3.0.3/arch/x86/boot
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/relocs.c linux-3.0.3/arch/x86/boot/compressed/relocs.c
---- linux-3.0.3/arch/x86/boot/compressed/relocs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/relocs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/relocs.c linux-3.0.4/arch/x86/boot/compressed/relocs.c
+--- linux-3.0.4/arch/x86/boot/compressed/relocs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/relocs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5431,9 +5431,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/relocs.c linux-3.0.3/arch/x86/bo
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-3.0.3/arch/x86/boot/cpucheck.c linux-3.0.3/arch/x86/boot/cpucheck.c
---- linux-3.0.3/arch/x86/boot/cpucheck.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/cpucheck.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/cpucheck.c linux-3.0.4/arch/x86/boot/cpucheck.c
+--- linux-3.0.4/arch/x86/boot/cpucheck.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/cpucheck.c	2011-08-23 21:47:55.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -5529,9 +5529,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/cpucheck.c linux-3.0.3/arch/x86/boot/cpuche
  
  		err = check_flags();
  	}
-diff -urNp linux-3.0.3/arch/x86/boot/header.S linux-3.0.3/arch/x86/boot/header.S
---- linux-3.0.3/arch/x86/boot/header.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/header.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/header.S linux-3.0.4/arch/x86/boot/header.S
+--- linux-3.0.4/arch/x86/boot/header.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/header.S	2011-08-23 21:47:55.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
@@ -5541,9 +5541,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/header.S linux-3.0.3/arch/x86/boot/header.S
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-3.0.3/arch/x86/boot/Makefile linux-3.0.3/arch/x86/boot/Makefile
---- linux-3.0.3/arch/x86/boot/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/Makefile linux-3.0.4/arch/x86/boot/Makefile
+--- linux-3.0.4/arch/x86/boot/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -69,6 +69,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -5554,9 +5554,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/Makefile linux-3.0.3/arch/x86/boot/Makefile
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.3/arch/x86/boot/memory.c linux-3.0.3/arch/x86/boot/memory.c
---- linux-3.0.3/arch/x86/boot/memory.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/memory.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/memory.c linux-3.0.4/arch/x86/boot/memory.c
+--- linux-3.0.4/arch/x86/boot/memory.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/memory.c	2011-08-23 21:47:55.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5566,9 +5566,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/memory.c linux-3.0.3/arch/x86/boot/memory.c
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-3.0.3/arch/x86/boot/video.c linux-3.0.3/arch/x86/boot/video.c
---- linux-3.0.3/arch/x86/boot/video.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/video.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/video.c linux-3.0.4/arch/x86/boot/video.c
+--- linux-3.0.4/arch/x86/boot/video.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/video.c	2011-08-23 21:47:55.000000000 -0400
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -5578,9 +5578,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/video.c linux-3.0.3/arch/x86/boot/video.c
  	int key;
  	unsigned int v;
  
-diff -urNp linux-3.0.3/arch/x86/boot/video-vesa.c linux-3.0.3/arch/x86/boot/video-vesa.c
---- linux-3.0.3/arch/x86/boot/video-vesa.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/video-vesa.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/video-vesa.c linux-3.0.4/arch/x86/boot/video-vesa.c
+--- linux-3.0.4/arch/x86/boot/video-vesa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/video-vesa.c	2011-08-23 21:47:55.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
  	boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5589,9 +5589,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/video-vesa.c linux-3.0.3/arch/x86/boot/vide
  }
  
  /*
-diff -urNp linux-3.0.3/arch/x86/ia32/ia32_aout.c linux-3.0.3/arch/x86/ia32/ia32_aout.c
---- linux-3.0.3/arch/x86/ia32/ia32_aout.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/ia32/ia32_aout.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/ia32/ia32_aout.c linux-3.0.4/arch/x86/ia32/ia32_aout.c
+--- linux-3.0.4/arch/x86/ia32/ia32_aout.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/ia32/ia32_aout.c	2011-08-23 21:48:14.000000000 -0400
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
@@ -5601,9 +5601,9 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32_aout.c linux-3.0.3/arch/x86/ia32/ia32_
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32entry.S
---- linux-3.0.3/arch/x86/ia32/ia32entry.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/ia32/ia32entry.S	2011-08-25 17:36:37.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32entry.S
+--- linux-3.0.4/arch/x86/ia32/ia32entry.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/ia32/ia32entry.S	2011-08-25 17:36:37.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -5780,9 +5780,9 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-3.0.3/arch/x86/ia32/ia32_signal.c linux-3.0.3/arch/x86/ia32/ia32_signal.c
---- linux-3.0.3/arch/x86/ia32/ia32_signal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/ia32/ia32_signal.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia32_signal.c
+--- linux-3.0.4/arch/x86/ia32/ia32_signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/ia32/ia32_signal.c	2011-08-23 21:47:55.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
  	sp -= frame_size;
  	/* Align the stack pointer according to the i386 ABI,
@@ -5832,9 +5832,9 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32_signal.c linux-3.0.3/arch/x86/ia32/ia3
  	} put_user_catch(err);
  
  	if (err)
-diff -urNp linux-3.0.3/arch/x86/include/asm/alternative.h linux-3.0.3/arch/x86/include/asm/alternative.h
---- linux-3.0.3/arch/x86/include/asm/alternative.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/alternative.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/alternative.h linux-3.0.4/arch/x86/include/asm/alternative.h
+--- linux-3.0.4/arch/x86/include/asm/alternative.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/alternative.h	2011-08-23 21:47:55.000000000 -0400
 @@ -93,7 +93,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"				\
        "	 .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */	\
@@ -5844,9 +5844,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/alternative.h linux-3.0.3/arch/x86/i
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/apic.h linux-3.0.3/arch/x86/include/asm/apic.h
---- linux-3.0.3/arch/x86/include/asm/apic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/apic.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/apic.h linux-3.0.4/arch/x86/include/asm/apic.h
+--- linux-3.0.4/arch/x86/include/asm/apic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/apic.h	2011-08-23 21:48:14.000000000 -0400
 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
  
  #ifdef CONFIG_X86_LOCAL_APIC
@@ -5856,9 +5856,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/apic.h linux-3.0.3/arch/x86/include/
  extern int local_apic_timer_c2_ok;
  
  extern int disable_apic;
-diff -urNp linux-3.0.3/arch/x86/include/asm/apm.h linux-3.0.3/arch/x86/include/asm/apm.h
---- linux-3.0.3/arch/x86/include/asm/apm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/apm.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/apm.h linux-3.0.4/arch/x86/include/asm/apm.h
+--- linux-3.0.4/arch/x86/include/asm/apm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/apm.h	2011-08-23 21:47:55.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
  	__asm__ __volatile__(APM_DO_ZERO_SEGS
  		"pushl %%edi\n\t"
@@ -5877,9 +5877,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/apm.h linux-3.0.3/arch/x86/include/a
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_32.h linux-3.0.3/arch/x86/include/asm/atomic64_32.h
---- linux-3.0.3/arch/x86/include/asm/atomic64_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/atomic64_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_32.h linux-3.0.4/arch/x86/include/asm/atomic64_32.h
+--- linux-3.0.4/arch/x86/include/asm/atomic64_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/atomic64_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -12,6 +12,14 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
@@ -6029,9 +6029,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_32.h linux-3.0.3/arch/x86/i
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_64.h linux-3.0.3/arch/x86/include/asm/atomic64_64.h
---- linux-3.0.3/arch/x86/include/asm/atomic64_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/atomic64_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_64.h linux-3.0.4/arch/x86/include/asm/atomic64_64.h
+--- linux-3.0.4/arch/x86/include/asm/atomic64_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/atomic64_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -6353,9 +6353,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_64.h linux-3.0.3/arch/x86/i
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.3/arch/x86/include/asm/atomic.h linux-3.0.3/arch/x86/include/asm/atomic.h
---- linux-3.0.3/arch/x86/include/asm/atomic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/atomic.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/include/asm/atomic.h
+--- linux-3.0.4/arch/x86/include/asm/atomic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/atomic.h	2011-08-23 21:47:55.000000000 -0400
 @@ -22,7 +22,18 @@
   */
  static inline int atomic_read(const atomic_t *v)
@@ -6768,9 +6768,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/atomic.h linux-3.0.3/arch/x86/includ
  /*
   * atomic_dec_if_positive - decrement by 1 if old value positive
   * @v: pointer of type atomic_t
-diff -urNp linux-3.0.3/arch/x86/include/asm/bitops.h linux-3.0.3/arch/x86/include/asm/bitops.h
---- linux-3.0.3/arch/x86/include/asm/bitops.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/bitops.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/bitops.h linux-3.0.4/arch/x86/include/asm/bitops.h
+--- linux-3.0.4/arch/x86/include/asm/bitops.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/bitops.h	2011-08-23 21:47:55.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -6780,9 +6780,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/bitops.h linux-3.0.3/arch/x86/includ
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-3.0.3/arch/x86/include/asm/boot.h linux-3.0.3/arch/x86/include/asm/boot.h
---- linux-3.0.3/arch/x86/include/asm/boot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/boot.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/boot.h linux-3.0.4/arch/x86/include/asm/boot.h
+--- linux-3.0.4/arch/x86/include/asm/boot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/boot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6800,9 +6800,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/boot.h linux-3.0.3/arch/x86/include/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff -urNp linux-3.0.3/arch/x86/include/asm/cacheflush.h linux-3.0.3/arch/x86/include/asm/cacheflush.h
---- linux-3.0.3/arch/x86/include/asm/cacheflush.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/cacheflush.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/cacheflush.h linux-3.0.4/arch/x86/include/asm/cacheflush.h
+--- linux-3.0.4/arch/x86/include/asm/cacheflush.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/cacheflush.h	2011-08-23 21:47:55.000000000 -0400
 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
  	unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -6812,9 +6812,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/cacheflush.h linux-3.0.3/arch/x86/in
  	else if (pg_flags == _PGMT_WC)
  		return _PAGE_CACHE_WC;
  	else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-3.0.3/arch/x86/include/asm/cache.h linux-3.0.3/arch/x86/include/asm/cache.h
---- linux-3.0.3/arch/x86/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/cache.h linux-3.0.4/arch/x86/include/asm/cache.h
+--- linux-3.0.4/arch/x86/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -6831,9 +6831,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/cache.h linux-3.0.3/arch/x86/include
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.3/arch/x86/include/asm/checksum_32.h linux-3.0.3/arch/x86/include/asm/checksum_32.h
---- linux-3.0.3/arch/x86/include/asm/checksum_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/checksum_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/checksum_32.h linux-3.0.4/arch/x86/include/asm/checksum_32.h
+--- linux-3.0.4/arch/x86/include/asm/checksum_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/checksum_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
@@ -6867,9 +6867,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/checksum_32.h linux-3.0.3/arch/x86/i
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-3.0.3/arch/x86/include/asm/cpufeature.h linux-3.0.3/arch/x86/include/asm/cpufeature.h
---- linux-3.0.3/arch/x86/include/asm/cpufeature.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/cpufeature.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/cpufeature.h linux-3.0.4/arch/x86/include/asm/cpufeature.h
+--- linux-3.0.4/arch/x86/include/asm/cpufeature.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/cpufeature.h	2011-08-23 21:47:55.000000000 -0400
 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
  			     ".section .discard,\"aw\",@progbits\n"
  			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -6879,9 +6879,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/cpufeature.h linux-3.0.3/arch/x86/in
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-diff -urNp linux-3.0.3/arch/x86/include/asm/desc_defs.h linux-3.0.3/arch/x86/include/asm/desc_defs.h
---- linux-3.0.3/arch/x86/include/asm/desc_defs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/desc_defs.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/desc_defs.h linux-3.0.4/arch/x86/include/asm/desc_defs.h
+--- linux-3.0.4/arch/x86/include/asm/desc_defs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/desc_defs.h	2011-08-23 21:47:55.000000000 -0400
 @@ -31,6 +31,12 @@ struct desc_struct {
  			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
  			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -6895,9 +6895,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/desc_defs.h linux-3.0.3/arch/x86/inc
  	};
  } __attribute__((packed));
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/desc.h linux-3.0.3/arch/x86/include/asm/desc.h
---- linux-3.0.3/arch/x86/include/asm/desc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/desc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/desc.h linux-3.0.4/arch/x86/include/asm/desc.h
+--- linux-3.0.4/arch/x86/include/asm/desc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/desc.h	2011-08-23 21:47:55.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7076,9 +7076,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/desc.h linux-3.0.3/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/e820.h linux-3.0.3/arch/x86/include/asm/e820.h
---- linux-3.0.3/arch/x86/include/asm/e820.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/e820.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/e820.h linux-3.0.4/arch/x86/include/asm/e820.h
+--- linux-3.0.4/arch/x86/include/asm/e820.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/e820.h	2011-08-23 21:47:55.000000000 -0400
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS	0xa0000
  #define ISA_END_ADDRESS		0x100000
@@ -7088,9 +7088,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/e820.h linux-3.0.3/arch/x86/include/
  #define BIOS_END		0x00100000
  
  #define BIOS_ROM_BASE		0xffe00000
-diff -urNp linux-3.0.3/arch/x86/include/asm/elf.h linux-3.0.3/arch/x86/include/asm/elf.h
---- linux-3.0.3/arch/x86/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/elf.h linux-3.0.4/arch/x86/include/asm/elf.h
+--- linux-3.0.4/arch/x86/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -237,7 +237,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -7145,9 +7145,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/elf.h linux-3.0.3/arch/x86/include/a
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/emergency-restart.h linux-3.0.3/arch/x86/include/asm/emergency-restart.h
---- linux-3.0.3/arch/x86/include/asm/emergency-restart.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/emergency-restart.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/emergency-restart.h linux-3.0.4/arch/x86/include/asm/emergency-restart.h
+--- linux-3.0.4/arch/x86/include/asm/emergency-restart.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/emergency-restart.h	2011-08-23 21:47:55.000000000 -0400
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -7156,9 +7156,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/emergency-restart.h linux-3.0.3/arch
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/futex.h linux-3.0.3/arch/x86/include/asm/futex.h
---- linux-3.0.3/arch/x86/include/asm/futex.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/futex.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include/asm/futex.h
+--- linux-3.0.4/arch/x86/include/asm/futex.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/futex.h	2011-08-23 21:47:55.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -7217,9 +7217,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/futex.h linux-3.0.3/arch/x86/include
  		     : "i" (-EFAULT), "r" (newval), "1" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-3.0.3/arch/x86/include/asm/hw_irq.h linux-3.0.3/arch/x86/include/asm/hw_irq.h
---- linux-3.0.3/arch/x86/include/asm/hw_irq.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/hw_irq.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/hw_irq.h linux-3.0.4/arch/x86/include/asm/hw_irq.h
+--- linux-3.0.4/arch/x86/include/asm/hw_irq.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/hw_irq.h	2011-08-23 21:47:55.000000000 -0400
 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
@@ -7231,9 +7231,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/hw_irq.h linux-3.0.3/arch/x86/includ
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-3.0.3/arch/x86/include/asm/i387.h linux-3.0.3/arch/x86/include/asm/i387.h
---- linux-3.0.3/arch/x86/include/asm/i387.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/i387.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/i387.h linux-3.0.4/arch/x86/include/asm/i387.h
+--- linux-3.0.4/arch/x86/include/asm/i387.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/i387.h	2011-08-23 21:47:55.000000000 -0400
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -7283,9 +7283,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/i387.h linux-3.0.3/arch/x86/include/
  	else
  		clts();
  }
-diff -urNp linux-3.0.3/arch/x86/include/asm/io.h linux-3.0.3/arch/x86/include/asm/io.h
---- linux-3.0.3/arch/x86/include/asm/io.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/io.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/io.h linux-3.0.4/arch/x86/include/asm/io.h
+--- linux-3.0.4/arch/x86/include/asm/io.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/io.h	2011-08-23 21:47:55.000000000 -0400
 @@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
@@ -7304,9 +7304,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/io.h linux-3.0.3/arch/x86/include/as
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-3.0.3/arch/x86/include/asm/irqflags.h linux-3.0.3/arch/x86/include/asm/irqflags.h
---- linux-3.0.3/arch/x86/include/asm/irqflags.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/irqflags.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/irqflags.h linux-3.0.4/arch/x86/include/asm/irqflags.h
+--- linux-3.0.4/arch/x86/include/asm/irqflags.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/irqflags.h	2011-08-23 21:47:55.000000000 -0400
 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
  	sti;					\
  	sysexit
@@ -7319,9 +7319,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/irqflags.h linux-3.0.3/arch/x86/incl
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-3.0.3/arch/x86/include/asm/kprobes.h linux-3.0.3/arch/x86/include/asm/kprobes.h
---- linux-3.0.3/arch/x86/include/asm/kprobes.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/kprobes.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/kprobes.h linux-3.0.4/arch/x86/include/asm/kprobes.h
+--- linux-3.0.4/arch/x86/include/asm/kprobes.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/kprobes.h	2011-08-23 21:47:55.000000000 -0400
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -7338,9 +7338,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/kprobes.h linux-3.0.3/arch/x86/inclu
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/kvm_host.h linux-3.0.3/arch/x86/include/asm/kvm_host.h
---- linux-3.0.3/arch/x86/include/asm/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/kvm_host.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/kvm_host.h linux-3.0.4/arch/x86/include/asm/kvm_host.h
+--- linux-3.0.4/arch/x86/include/asm/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/kvm_host.h	2011-08-26 19:49:56.000000000 -0400
 @@ -441,7 +441,7 @@ struct kvm_arch {
  	unsigned int n_used_mmu_pages;
  	unsigned int n_requested_mmu_pages;
@@ -7359,9 +7359,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/kvm_host.h linux-3.0.3/arch/x86/incl
  
  struct kvm_arch_async_pf {
  	u32 token;
-diff -urNp linux-3.0.3/arch/x86/include/asm/local.h linux-3.0.3/arch/x86/include/asm/local.h
---- linux-3.0.3/arch/x86/include/asm/local.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/local.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/local.h linux-3.0.4/arch/x86/include/asm/local.h
+--- linux-3.0.4/arch/x86/include/asm/local.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/local.h	2011-08-23 21:47:55.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -7514,9 +7514,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/local.h linux-3.0.3/arch/x86/include
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-3.0.3/arch/x86/include/asm/mman.h linux-3.0.3/arch/x86/include/asm/mman.h
---- linux-3.0.3/arch/x86/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/mman.h linux-3.0.4/arch/x86/include/asm/mman.h
+--- linux-3.0.4/arch/x86/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7532,9 +7532,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/mman.h linux-3.0.3/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/mmu_context.h linux-3.0.3/arch/x86/include/asm/mmu_context.h
---- linux-3.0.3/arch/x86/include/asm/mmu_context.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/mmu_context.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/mmu_context.h linux-3.0.4/arch/x86/include/asm/mmu_context.h
+--- linux-3.0.4/arch/x86/include/asm/mmu_context.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/mmu_context.h	2011-08-23 21:48:14.000000000 -0400
 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7655,9 +7655,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/mmu_context.h linux-3.0.3/arch/x86/i
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-3.0.3/arch/x86/include/asm/mmu.h linux-3.0.3/arch/x86/include/asm/mmu.h
---- linux-3.0.3/arch/x86/include/asm/mmu.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/mmu.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/mmu.h linux-3.0.4/arch/x86/include/asm/mmu.h
+--- linux-3.0.4/arch/x86/include/asm/mmu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/mmu.h	2011-08-23 21:47:55.000000000 -0400
 @@ -9,7 +9,7 @@
   * we put the segment information here.
   */
@@ -7688,9 +7688,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/mmu.h linux-3.0.3/arch/x86/include/a
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.3/arch/x86/include/asm/module.h linux-3.0.3/arch/x86/include/asm/module.h
---- linux-3.0.3/arch/x86/include/asm/module.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/module.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/module.h linux-3.0.4/arch/x86/include/asm/module.h
+--- linux-3.0.4/arch/x86/include/asm/module.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/module.h	2011-08-23 21:48:14.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -7732,9 +7732,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/module.h linux-3.0.3/arch/x86/includ
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/page_64_types.h linux-3.0.3/arch/x86/include/asm/page_64_types.h
---- linux-3.0.3/arch/x86/include/asm/page_64_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/page_64_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/page_64_types.h linux-3.0.4/arch/x86/include/asm/page_64_types.h
+--- linux-3.0.4/arch/x86/include/asm/page_64_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/page_64_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -7744,9 +7744,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/page_64_types.h linux-3.0.3/arch/x86
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt.h linux-3.0.3/arch/x86/include/asm/paravirt.h
---- linux-3.0.3/arch/x86/include/asm/paravirt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/paravirt.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/include/asm/paravirt.h
+--- linux-3.0.4/arch/x86/include/asm/paravirt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/paravirt.h	2011-08-23 21:47:55.000000000 -0400
 @@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, 
  			    val);
  }
@@ -7819,9 +7819,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt.h linux-3.0.3/arch/x86/incl
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt_types.h linux-3.0.3/arch/x86/include/asm/paravirt_types.h
---- linux-3.0.3/arch/x86/include/asm/paravirt_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/paravirt_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x86/include/asm/paravirt_types.h
+--- linux-3.0.4/arch/x86/include/asm/paravirt_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/paravirt_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -78,19 +78,19 @@ struct pv_init_ops {
  	 */
  	unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
@@ -7893,9 +7893,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt_types.h linux-3.0.3/arch/x8
  
  /* This contains all the paravirt structures: we get a convenient
   * number for each function using the offset which we use to indicate
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgalloc.h linux-3.0.3/arch/x86/include/asm/pgalloc.h
---- linux-3.0.3/arch/x86/include/asm/pgalloc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgalloc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgalloc.h linux-3.0.4/arch/x86/include/asm/pgalloc.h
+--- linux-3.0.4/arch/x86/include/asm/pgalloc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgalloc.h	2011-08-23 21:47:55.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
  				       pmd_t *pmd, pte_t *pte)
  {
@@ -7910,9 +7910,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgalloc.h linux-3.0.3/arch/x86/inclu
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-2level.h linux-3.0.3/arch/x86/include/asm/pgtable-2level.h
---- linux-3.0.3/arch/x86/include/asm/pgtable-2level.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable-2level.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-2level.h linux-3.0.4/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable-2level.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable-2level.h	2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7923,9 +7923,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-2level.h linux-3.0.3/arch/x8
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32.h linux-3.0.3/arch/x86/include/asm/pgtable_32.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32.h linux-3.0.4/arch/x86/include/asm/pgtable_32.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -7969,9 +7969,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32.h linux-3.0.3/arch/x86/in
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8001,9 +8001,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h linux-3.0.3/arch/
  #define MODULES_VADDR	VMALLOC_START
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-3level.h linux-3.0.3/arch/x86/include/asm/pgtable-3level.h
---- linux-3.0.3/arch/x86/include/asm/pgtable-3level.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable-3level.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-3level.h linux-3.0.4/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable-3level.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable-3level.h	2011-08-23 21:47:55.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8021,9 +8021,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-3level.h linux-3.0.3/arch/x8
  }
  
  /*
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64.h linux-3.0.3/arch/x86/include/asm/pgtable_64.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64.h linux-3.0.4/arch/x86/include/asm/pgtable_64.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8064,9 +8064,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64.h linux-3.0.3/arch/x86/in
  	*pgdp = pgd;
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -8078,9 +8078,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h linux-3.0.3/arch/
 +#define ktva_ktla(addr)		(addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable.h linux-3.0.3/arch/x86/include/asm/pgtable.h
---- linux-3.0.3/arch/x86/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable.h linux-3.0.4/arch/x86/include/asm/pgtable.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
  
  #ifndef __PAGETABLE_PUD_FOLDED
@@ -8258,9 +8258,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable.h linux-3.0.3/arch/x86/inclu
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_types.h linux-3.0.3/arch/x86/include/asm/pgtable_types.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86/include/asm/pgtable_types.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -8374,9 +8374,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_types.h linux-3.0.3/arch/x86
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-3.0.3/arch/x86/include/asm/processor.h linux-3.0.3/arch/x86/include/asm/processor.h
---- linux-3.0.3/arch/x86/include/asm/processor.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/processor.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/include/asm/processor.h
+--- linux-3.0.4/arch/x86/include/asm/processor.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/processor.h	2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -8479,9 +8479,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/processor.h linux-3.0.3/arch/x86/inc
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-3.0.3/arch/x86/include/asm/ptrace.h linux-3.0.3/arch/x86/include/asm/ptrace.h
---- linux-3.0.3/arch/x86/include/asm/ptrace.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/ptrace.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/ptrace.h linux-3.0.4/arch/x86/include/asm/ptrace.h
+--- linux-3.0.4/arch/x86/include/asm/ptrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/ptrace.h	2011-08-23 21:47:55.000000000 -0400
 @@ -153,28 +153,29 @@ static inline unsigned long regs_return_
  }
  
@@ -8518,9 +8518,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/ptrace.h linux-3.0.3/arch/x86/includ
  #endif
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/reboot.h linux-3.0.3/arch/x86/include/asm/reboot.h
---- linux-3.0.3/arch/x86/include/asm/reboot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/reboot.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/reboot.h linux-3.0.4/arch/x86/include/asm/reboot.h
+--- linux-3.0.4/arch/x86/include/asm/reboot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/reboot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -8547,9 +8547,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/reboot.h linux-3.0.3/arch/x86/includ
  /* These must match dispatch_table in reboot_32.S */
  #define MRR_BIOS	0
  #define MRR_APM		1
-diff -urNp linux-3.0.3/arch/x86/include/asm/rwsem.h linux-3.0.3/arch/x86/include/asm/rwsem.h
---- linux-3.0.3/arch/x86/include/asm/rwsem.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/rwsem.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/rwsem.h linux-3.0.4/arch/x86/include/asm/rwsem.h
+--- linux-3.0.4/arch/x86/include/asm/rwsem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/rwsem.h	2011-08-23 21:47:55.000000000 -0400
 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
@@ -8674,9 +8674,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/rwsem.h linux-3.0.3/arch/x86/include
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/segment.h linux-3.0.3/arch/x86/include/asm/segment.h
---- linux-3.0.3/arch/x86/include/asm/segment.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/segment.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/include/asm/segment.h
+--- linux-3.0.4/arch/x86/include/asm/segment.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/segment.h	2011-08-23 21:47:55.000000000 -0400
 @@ -64,8 +64,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -8736,9 +8736,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/segment.h linux-3.0.3/arch/x86/inclu
  #define __KERNEL_DS	(GDT_ENTRY_KERNEL_DS*8)
  #define __USER_DS	(GDT_ENTRY_DEFAULT_USER_DS*8+3)
  #define __USER_CS	(GDT_ENTRY_DEFAULT_USER_CS*8+3)
-diff -urNp linux-3.0.3/arch/x86/include/asm/smp.h linux-3.0.3/arch/x86/include/asm/smp.h
---- linux-3.0.3/arch/x86/include/asm/smp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/smp.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/smp.h linux-3.0.4/arch/x86/include/asm/smp.h
+--- linux-3.0.4/arch/x86/include/asm/smp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/smp.h	2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
  /* cpus sharing the last level cache: */
  DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
@@ -8774,9 +8774,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/smp.h linux-3.0.3/arch/x86/include/a
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-3.0.3/arch/x86/include/asm/spinlock.h linux-3.0.3/arch/x86/include/asm/spinlock.h
---- linux-3.0.3/arch/x86/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/include/asm/spinlock.h
+--- linux-3.0.4/arch/x86/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
@@ -8839,9 +8839,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/spinlock.h linux-3.0.3/arch/x86/incl
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/stackprotector.h linux-3.0.3/arch/x86/include/asm/stackprotector.h
---- linux-3.0.3/arch/x86/include/asm/stackprotector.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/stackprotector.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/stackprotector.h linux-3.0.4/arch/x86/include/asm/stackprotector.h
+--- linux-3.0.4/arch/x86/include/asm/stackprotector.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/stackprotector.h	2011-08-23 21:47:55.000000000 -0400
 @@ -48,7 +48,7 @@
   * head_32 for boot CPU and setup_per_cpu_areas() for others.
   */
@@ -8860,9 +8860,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/stackprotector.h linux-3.0.3/arch/x8
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-3.0.3/arch/x86/include/asm/stacktrace.h linux-3.0.3/arch/x86/include/asm/stacktrace.h
---- linux-3.0.3/arch/x86/include/asm/stacktrace.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/stacktrace.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/stacktrace.h linux-3.0.4/arch/x86/include/asm/stacktrace.h
+--- linux-3.0.4/arch/x86/include/asm/stacktrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/stacktrace.h	2011-08-23 21:47:55.000000000 -0400
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -8913,9 +8913,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/stacktrace.h linux-3.0.3/arch/x86/in
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-3.0.3/arch/x86/include/asm/system.h linux-3.0.3/arch/x86/include/asm/system.h
---- linux-3.0.3/arch/x86/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/system.h linux-3.0.4/arch/x86/include/asm/system.h
+--- linux-3.0.4/arch/x86/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -129,7 +129,7 @@ do {									\
  	     "call __switch_to\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
@@ -8958,9 +8958,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/system.h linux-3.0.3/arch/x86/includ
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-3.0.3/arch/x86/include/asm/thread_info.h linux-3.0.3/arch/x86/include/asm/thread_info.h
---- linux-3.0.3/arch/x86/include/asm/thread_info.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/thread_info.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/include/asm/thread_info.h
+--- linux-3.0.4/arch/x86/include/asm/thread_info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/thread_info.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -9108,9 +9108,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/thread_info.h linux-3.0.3/arch/x86/i
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_32.h linux-3.0.3/arch/x86/include/asm/uaccess_32.h
---- linux-3.0.3/arch/x86/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/uaccess_32.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_32.h linux-3.0.4/arch/x86/include/asm/uaccess_32.h
+--- linux-3.0.4/arch/x86/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/uaccess_32.h	2011-08-23 21:48:14.000000000 -0400
 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_u
  static __always_inline unsigned long __must_check
  __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9278,9 +9278,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_32.h linux-3.0.3/arch/x86/in
  	return n;
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_64.h linux-3.0.3/arch/x86/include/asm/uaccess_64.h
---- linux-3.0.3/arch/x86/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/uaccess_64.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/include/asm/uaccess_64.h
+--- linux-3.0.4/arch/x86/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/uaccess_64.h	2011-08-23 21:48:14.000000000 -0400
 @@ -10,6 +10,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -9685,9 +9685,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_64.h linux-3.0.3/arch/x86/in
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess.h linux-3.0.3/arch/x86/include/asm/uaccess.h
---- linux-3.0.3/arch/x86/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/include/asm/uaccess.h
+--- linux-3.0.4/arch/x86/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -7,12 +7,15 @@
  #include <linux/compiler.h>
  #include <linux/thread_info.h>
@@ -9898,9 +9898,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess.h linux-3.0.3/arch/x86/inclu
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-diff -urNp linux-3.0.3/arch/x86/include/asm/vgtod.h linux-3.0.3/arch/x86/include/asm/vgtod.h
---- linux-3.0.3/arch/x86/include/asm/vgtod.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/vgtod.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/vgtod.h linux-3.0.4/arch/x86/include/asm/vgtod.h
+--- linux-3.0.4/arch/x86/include/asm/vgtod.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/vgtod.h	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -9909,9 +9909,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/vgtod.h linux-3.0.3/arch/x86/include
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff -urNp linux-3.0.3/arch/x86/include/asm/x86_init.h linux-3.0.3/arch/x86/include/asm/x86_init.h
---- linux-3.0.3/arch/x86/include/asm/x86_init.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/x86_init.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/include/asm/x86_init.h
+--- linux-3.0.4/arch/x86/include/asm/x86_init.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/x86_init.h	2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
  	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
  	void (*find_smp_config)(void);
@@ -10029,9 +10029,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/x86_init.h linux-3.0.3/arch/x86/incl
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-3.0.3/arch/x86/include/asm/xsave.h linux-3.0.3/arch/x86/include/asm/xsave.h
---- linux-3.0.3/arch/x86/include/asm/xsave.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/xsave.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include/asm/xsave.h
+--- linux-3.0.4/arch/x86/include/asm/xsave.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/xsave.h	2011-08-23 21:47:55.000000000 -0400
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
  	int err;
@@ -10056,9 +10056,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/xsave.h linux-3.0.3/arch/x86/include
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-3.0.3/arch/x86/Kconfig linux-3.0.3/arch/x86/Kconfig
---- linux-3.0.3/arch/x86/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
+--- linux-3.0.4/arch/x86/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -229,7 +229,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
@@ -10140,9 +10140,9 @@ diff -urNp linux-3.0.3/arch/x86/Kconfig linux-3.0.3/arch/x86/Kconfig
  	---help---
  	  Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-3.0.3/arch/x86/Kconfig.cpu linux-3.0.3/arch/x86/Kconfig.cpu
---- linux-3.0.3/arch/x86/Kconfig.cpu	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Kconfig.cpu	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
+--- linux-3.0.4/arch/x86/Kconfig.cpu	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Kconfig.cpu	2011-08-23 21:47:55.000000000 -0400
 @@ -338,7 +338,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -10170,9 +10170,9 @@ diff -urNp linux-3.0.3/arch/x86/Kconfig.cpu linux-3.0.3/arch/x86/Kconfig.cpu
  
  config X86_MINIMUM_CPU_FAMILY
  	int
-diff -urNp linux-3.0.3/arch/x86/Kconfig.debug linux-3.0.3/arch/x86/Kconfig.debug
---- linux-3.0.3/arch/x86/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Kconfig.debug	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Kconfig.debug linux-3.0.4/arch/x86/Kconfig.debug
+--- linux-3.0.4/arch/x86/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Kconfig.debug	2011-08-23 21:47:55.000000000 -0400
 @@ -81,7 +81,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
@@ -10191,9 +10191,9 @@ diff -urNp linux-3.0.3/arch/x86/Kconfig.debug linux-3.0.3/arch/x86/Kconfig.debug
  	---help---
  	  This option helps catch unintended modifications to loadable
  	  kernel module's text and read-only data. It also prevents execution
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile
---- linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -41,6 +41,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -10204,9 +10204,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.3/arch/x
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S	2011-08-23 21:48:14.000000000 -0400
 @@ -108,6 +108,9 @@ wakeup_code:
  	/* Do any other stuff... */
  
@@ -10225,9 +10225,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.3/arch/x
  #else
  	pushw	$0
  	pushw	trampoline_segment
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/sleep.c linux-3.0.3/arch/x86/kernel/acpi/sleep.c
---- linux-3.0.3/arch/x86/kernel/acpi/sleep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/sleep.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/sleep.c linux-3.0.4/arch/x86/kernel/acpi/sleep.c
+--- linux-3.0.4/arch/x86/kernel/acpi/sleep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/sleep.c	2011-08-23 21:47:55.000000000 -0400
 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
  	header->trampoline_segment = trampoline_address() >> 4;
  #ifdef CONFIG_SMP
@@ -10241,9 +10241,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/sleep.c linux-3.0.3/arch/x86/kernel/
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S
---- linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
  	# and restore the stack ... but you need gdt for this to work
  	movl	saved_context_esp, %esp
@@ -10260,9 +10260,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.3/arch/x86/ker
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-3.0.3/arch/x86/kernel/alternative.c linux-3.0.3/arch/x86/kernel/alternative.c
---- linux-3.0.3/arch/x86/kernel/alternative.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/alternative.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel/alternative.c
+--- linux-3.0.4/arch/x86/kernel/alternative.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/alternative.c	2011-08-23 21:47:55.000000000 -0400
 @@ -313,7 +313,7 @@ static void alternatives_smp_lock(const 
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
@@ -10364,9 +10364,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/alternative.c linux-3.0.3/arch/x86/kernel
  	return addr;
  }
  
-diff -urNp linux-3.0.3/arch/x86/kernel/apic/apic.c linux-3.0.3/arch/x86/kernel/apic/apic.c
---- linux-3.0.3/arch/x86/kernel/apic/apic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/apic/apic.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/apic/apic.c
+--- linux-3.0.4/arch/x86/kernel/apic/apic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/apic/apic.c	2011-08-23 21:48:14.000000000 -0400
 @@ -173,7 +173,7 @@ int first_system_vector = 0xfe;
  /*
   * Debug level, exported for io_apic.c
@@ -10394,9 +10394,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/apic/apic.c linux-3.0.3/arch/x86/kernel/a
  	bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
  	bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff -urNp linux-3.0.3/arch/x86/kernel/apic/io_apic.c linux-3.0.3/arch/x86/kernel/apic/io_apic.c
---- linux-3.0.3/arch/x86/kernel/apic/io_apic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/apic/io_apic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kernel/apic/io_apic.c
+--- linux-3.0.4/arch/x86/kernel/apic/io_apic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/apic/io_apic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -10433,9 +10433,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/apic/io_apic.c linux-3.0.3/arch/x86/kerne
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-diff -urNp linux-3.0.3/arch/x86/kernel/apm_32.c linux-3.0.3/arch/x86/kernel/apm_32.c
---- linux-3.0.3/arch/x86/kernel/apm_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/apm_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/apm_32.c linux-3.0.4/arch/x86/kernel/apm_32.c
+--- linux-3.0.4/arch/x86/kernel/apm_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/apm_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -10507,9 +10507,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/apm_32.c linux-3.0.3/arch/x86/kernel/apm_
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets_64.c linux-3.0.3/arch/x86/kernel/asm-offsets_64.c
---- linux-3.0.3/arch/x86/kernel/asm-offsets_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/asm-offsets_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets_64.c linux-3.0.4/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.0.4/arch/x86/kernel/asm-offsets_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/asm-offsets_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -69,6 +69,7 @@ int main(void)
  	BLANK();
  #undef ENTRY
@@ -10518,9 +10518,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets_64.c linux-3.0.3/arch/x86/ker
  	OFFSET(TSS_ist, tss_struct, x86_tss.ist);
  	BLANK();
  
-diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets.c linux-3.0.3/arch/x86/kernel/asm-offsets.c
---- linux-3.0.3/arch/x86/kernel/asm-offsets.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/asm-offsets.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets.c linux-3.0.4/arch/x86/kernel/asm-offsets.c
+--- linux-3.0.4/arch/x86/kernel/asm-offsets.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/asm-offsets.c	2011-08-23 21:47:55.000000000 -0400
 @@ -33,6 +33,8 @@ void common(void) {
  	OFFSET(TI_status, thread_info, status);
  	OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -10557,9 +10557,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets.c linux-3.0.3/arch/x86/kernel
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/amd.c linux-3.0.3/arch/x86/kernel/cpu/amd.c
---- linux-3.0.3/arch/x86/kernel/cpu/amd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/amd.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/amd.c linux-3.0.4/arch/x86/kernel/cpu/amd.c
+--- linux-3.0.4/arch/x86/kernel/cpu/amd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/amd.c	2011-08-23 21:47:55.000000000 -0400
 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
@@ -10569,9 +10569,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/amd.c linux-3.0.3/arch/x86/kernel/cpu
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/common.c linux-3.0.3/arch/x86/kernel/cpu/common.c
---- linux-3.0.3/arch/x86/kernel/cpu/common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/common.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/common.c linux-3.0.4/arch/x86/kernel/cpu/common.c
+--- linux-3.0.4/arch/x86/kernel/cpu/common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/common.c	2011-08-23 21:47:55.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10716,9 +10716,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/common.c linux-3.0.3/arch/x86/kernel/
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/intel.c linux-3.0.3/arch/x86/kernel/cpu/intel.c
---- linux-3.0.3/arch/x86/kernel/cpu/intel.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/intel.c	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/intel.c linux-3.0.4/arch/x86/kernel/cpu/intel.c
+--- linux-3.0.4/arch/x86/kernel/cpu/intel.c	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/intel.c	2011-08-29 23:30:14.000000000 -0400
 @@ -172,7 +172,7 @@ static void __cpuinit trap_init_f00f_bug
  	 * Update the IDT descriptor and reload the IDT so that
  	 * it uses the read-only mapped virtual address.
@@ -10728,18 +10728,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/intel.c linux-3.0.3/arch/x86/kernel/c
  	load_idt(&idt_descr);
  }
  #endif
-@@ -466,7 +466,7 @@ static void __cpuinit init_intel(struct 
- 
- 		rdmsrl(MSR_IA32_ENERGY_PERF_BIAS, epb);
- 		if ((epb & 0xF) == 0) {
--			printk_once(KERN_WARNING, "x86: updated energy_perf_bias"
-+			printk_once(KERN_WARNING "x86: updated energy_perf_bias"
- 				" to 'normal' from 'performance'\n"
- 				"You can view and update epb via utility,"
- 				" such as x86_energy_perf_policy(8)\n");
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/Makefile linux-3.0.3/arch/x86/kernel/cpu/Makefile
---- linux-3.0.3/arch/x86/kernel/cpu/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/Makefile linux-3.0.4/arch/x86/kernel/cpu/Makefile
+--- linux-3.0.4/arch/x86/kernel/cpu/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -10751,9 +10742,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/Makefile linux-3.0.3/arch/x86/kernel/
  obj-y			:= intel_cacheinfo.o scattered.o topology.o
  obj-y			+= proc.o capflags.o powerflags.o common.o
  obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-08-23 21:47:55.000000000 -0400
 @@ -46,6 +46,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
@@ -10855,9 +10846,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.3/arch/x86/ker
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-23 21:47:55.000000000 -0400
 @@ -215,7 +215,9 @@ static int inject_init(void)
  	if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
  		return -ENOMEM;
@@ -10869,9 +10860,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.3/arch/
  	register_die_notifier(&mce_raise_nb);
  	return 0;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c
---- linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c	2011-08-29 23:26:21.000000000 -0400
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -10881,9 +10872,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.3/arch/x86/kern
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-26 19:49:56.000000000 -0400
 @@ -25,7 +25,7 @@ struct mtrr_ops {
  	int	(*validate_add_page)(unsigned long base, unsigned long size,
  				     unsigned int type);
@@ -10893,9 +10884,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.3/arch/x86/kern
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
  				   int replace_reg);
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/perf_event.c linux-3.0.3/arch/x86/kernel/cpu/perf_event.c
---- linux-3.0.3/arch/x86/kernel/cpu/perf_event.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/perf_event.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.0.4/arch/x86/kernel/cpu/perf_event.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/perf_event.c	2011-08-23 21:48:14.000000000 -0400
 @@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp
  	int i, j, w, wmax, num = 0;
  	struct hw_perf_event *hwc;
@@ -10914,9 +10905,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/perf_event.c linux-3.0.3/arch/x86/ker
  	}
  }
  
-diff -urNp linux-3.0.3/arch/x86/kernel/crash.c linux-3.0.3/arch/x86/kernel/crash.c
---- linux-3.0.3/arch/x86/kernel/crash.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/crash.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/crash.c linux-3.0.4/arch/x86/kernel/crash.c
+--- linux-3.0.4/arch/x86/kernel/crash.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/crash.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
@@ -10926,9 +10917,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/crash.c linux-3.0.3/arch/x86/kernel/crash
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-3.0.3/arch/x86/kernel/doublefault_32.c linux-3.0.3/arch/x86/kernel/doublefault_32.c
---- linux-3.0.3/arch/x86/kernel/doublefault_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/doublefault_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/doublefault_32.c linux-3.0.4/arch/x86/kernel/doublefault_32.c
+--- linux-3.0.4/arch/x86/kernel/doublefault_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/doublefault_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10960,9 +10951,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/doublefault_32.c linux-3.0.3/arch/x86/ker
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_32.c linux-3.0.3/arch/x86/kernel/dumpstack_32.c
---- linux-3.0.3/arch/x86/kernel/dumpstack_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/dumpstack_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_32.c linux-3.0.4/arch/x86/kernel/dumpstack_32.c
+--- linux-3.0.4/arch/x86/kernel/dumpstack_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/dumpstack_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
  		bp = stack_frame(task, regs);
  
@@ -11026,9 +11017,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_32.c linux-3.0.3/arch/x86/kerne
  	if (ip < PAGE_OFFSET)
  		return 0;
  	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_64.c linux-3.0.3/arch/x86/kernel/dumpstack_64.c
---- linux-3.0.3/arch/x86/kernel/dumpstack_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/dumpstack_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kernel/dumpstack_64.c
+--- linux-3.0.4/arch/x86/kernel/dumpstack_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/dumpstack_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
  	unsigned long *irq_stack_end =
  		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -11080,9 +11071,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_64.c linux-3.0.3/arch/x86/kerne
  	put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack.c linux-3.0.3/arch/x86/kernel/dumpstack.c
---- linux-3.0.3/arch/x86/kernel/dumpstack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/dumpstack.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack.c linux-3.0.4/arch/x86/kernel/dumpstack.c
+--- linux-3.0.4/arch/x86/kernel/dumpstack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/dumpstack.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11226,9 +11217,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack.c linux-3.0.3/arch/x86/kernel/d
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-3.0.3/arch/x86/kernel/early_printk.c linux-3.0.3/arch/x86/kernel/early_printk.c
---- linux-3.0.3/arch/x86/kernel/early_printk.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/early_printk.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kernel/early_printk.c
+--- linux-3.0.4/arch/x86/kernel/early_printk.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/early_printk.c	2011-08-23 21:48:14.000000000 -0400
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -11246,9 +11237,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/early_printk.c linux-3.0.3/arch/x86/kerne
  	va_start(ap, fmt);
  	n = vscnprintf(buf, sizeof(buf), fmt, ap);
  	early_console->write(early_console, buf, n);
-diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/entry_32.S
---- linux-3.0.3/arch/x86/kernel/entry_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/entry_32.S	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/entry_32.S
+--- linux-3.0.4/arch/x86/kernel/entry_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/entry_32.S	2011-08-30 18:23:52.000000000 -0400
 @@ -185,13 +185,146 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
@@ -11485,13 +11476,14 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -433,12 +594,23 @@ sysenter_do_call:
+@@ -433,12 +594,24 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
 +	pushl_cfi %eax
++	movl %esp, %eax
 +	call pax_randomize_kstack
 +	popl_cfi %eax
 +#endif
@@ -11509,7 +11501,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -455,6 +627,9 @@ sysenter_audit:
+@@ -455,6 +628,9 @@ sysenter_audit:
  	movl %eax,%edx			/* 2nd arg: syscall number */
  	movl $AUDIT_ARCH_I386,%eax	/* 1st arg: audit arch */
  	call audit_syscall_entry
@@ -11519,7 +11511,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	pushl_cfi %ebx
  	movl PT_EAX(%esp),%eax		/* reload syscall number */
  	jmp sysenter_do_call
-@@ -481,11 +656,17 @@ sysexit_audit:
+@@ -481,11 +657,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -11539,13 +11531,14 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -518,6 +699,14 @@ syscall_exit:
+@@ -518,6 +700,15 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
 +restore_all_pax:
 +
 +#ifdef CONFIG_PAX_RANDKSTACK
++	movl %esp, %eax
 +	call pax_randomize_kstack
 +#endif
 +
@@ -11554,7 +11547,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -577,14 +766,34 @@ ldt_ss:
+@@ -577,14 +768,34 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -11592,7 +11585,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	pushl_cfi $__ESPFIX_SS
  	pushl_cfi %eax			/* new kernel esp */
  	/* Disable interrupts, but do not irqtrace this section: we
-@@ -613,29 +822,23 @@ work_resched:
+@@ -613,29 +824,23 @@ work_resched:
  	movl TI_flags(%ebp), %ecx
  	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other
  					# than syscall tracing?
@@ -11626,7 +11619,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  #endif
  	xorl %edx, %edx
  	call do_notify_resume
-@@ -648,6 +851,9 @@ syscall_trace_entry:
+@@ -648,6 +853,9 @@ syscall_trace_entry:
  	movl $-ENOSYS,PT_EAX(%esp)
  	movl %esp, %eax
  	call syscall_trace_enter
@@ -11636,7 +11629,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	/* What it returned is what we'll actually use.  */
  	cmpl $(nr_syscalls), %eax
  	jnae syscall_call
-@@ -670,6 +876,10 @@ END(syscall_exit_work)
+@@ -670,6 +878,10 @@ END(syscall_exit_work)
  
  	RING0_INT_FRAME			# can't unwind into user space anyway
  syscall_fault:
@@ -11647,7 +11640,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	GET_THREAD_INFO(%ebp)
  	movl $-EFAULT,PT_EAX(%esp)
  	jmp resume_userspace
-@@ -752,6 +962,36 @@ ptregs_clone:
+@@ -752,6 +964,36 @@ ptregs_clone:
  	CFI_ENDPROC
  ENDPROC(ptregs_clone)
  
@@ -11684,7 +11677,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -761,8 +1001,15 @@ ENDPROC(ptregs_clone)
+@@ -761,8 +1003,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -11702,7 +11695,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	shl $16, %eax
  	addl %esp, %eax			/* the adjusted stack pointer */
  	pushl_cfi $__KERNEL_DS
-@@ -1213,7 +1460,6 @@ return_to_handler:
+@@ -1213,7 +1462,6 @@ return_to_handler:
  	jmp *%ecx
  #endif
  
@@ -11710,7 +11703,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1259,9 +1505,12 @@ error_code:
+@@ -1259,9 +1507,12 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -11724,7 +11717,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	TRACE_IRQS_OFF
  	movl %esp,%eax			# pt_regs pointer
  	call *%edi
-@@ -1346,6 +1595,9 @@ nmi_stack_correct:
+@@ -1346,6 +1597,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -11734,7 +11727,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1382,6 +1634,9 @@ nmi_espfix_stack:
+@@ -1382,6 +1636,9 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -11744,9 +11737,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/entry_64.S
---- linux-3.0.3/arch/x86/kernel/entry_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/entry_64.S	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/entry_64.S
+--- linux-3.0.4/arch/x86/kernel/entry_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/entry_64.S	2011-08-26 19:49:56.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -12326,9 +12319,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff -urNp linux-3.0.3/arch/x86/kernel/ftrace.c linux-3.0.3/arch/x86/kernel/ftrace.c
---- linux-3.0.3/arch/x86/kernel/ftrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ftrace.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ftrace.c linux-3.0.4/arch/x86/kernel/ftrace.c
+--- linux-3.0.4/arch/x86/kernel/ftrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ftrace.c	2011-08-23 21:47:55.000000000 -0400
 @@ -126,7 +126,7 @@ static void *mod_code_ip;		/* holds the 
  static const void *mod_code_newcode;	/* holds the text to write to the IP */
  
@@ -12386,9 +12379,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ftrace.c linux-3.0.3/arch/x86/kernel/ftra
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-3.0.3/arch/x86/kernel/head32.c linux-3.0.3/arch/x86/kernel/head32.c
---- linux-3.0.3/arch/x86/kernel/head32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/head32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/head32.c linux-3.0.4/arch/x86/kernel/head32.c
+--- linux-3.0.4/arch/x86/kernel/head32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/head32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -12406,9 +12399,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/head32.c linux-3.0.3/arch/x86/kernel/head
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-3.0.3/arch/x86/kernel/head_32.S linux-3.0.3/arch/x86/kernel/head_32.S
---- linux-3.0.3/arch/x86/kernel/head_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/head_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/head_32.S linux-3.0.4/arch/x86/kernel/head_32.S
+--- linux-3.0.4/arch/x86/kernel/head_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/head_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -12843,9 +12836,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/head_32.S linux-3.0.3/arch/x86/kernel/hea
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff -urNp linux-3.0.3/arch/x86/kernel/head_64.S linux-3.0.3/arch/x86/kernel/head_64.S
---- linux-3.0.3/arch/x86/kernel/head_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/head_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/head_64.S linux-3.0.4/arch/x86/kernel/head_64.S
+--- linux-3.0.4/arch/x86/kernel/head_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/head_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -13115,9 +13108,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/head_64.S linux-3.0.3/arch/x86/kernel/hea
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c
---- linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -13139,9 +13132,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c linux-3.0.3/arch/x86/kern
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-3.0.3/arch/x86/kernel/i8259.c linux-3.0.3/arch/x86/kernel/i8259.c
---- linux-3.0.3/arch/x86/kernel/i8259.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/i8259.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/i8259.c linux-3.0.4/arch/x86/kernel/i8259.c
+--- linux-3.0.4/arch/x86/kernel/i8259.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/i8259.c	2011-08-23 21:47:55.000000000 -0400
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
  			       "spurious 8259A interrupt: IRQ%d.\n", irq);
  			spurious_irq_mask |= irqmask;
@@ -13151,9 +13144,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/i8259.c linux-3.0.3/arch/x86/kernel/i8259
  		/*
  		 * Theoretically we do not have to handle this IRQ,
  		 * but in Linux this does not cause problems and is
-diff -urNp linux-3.0.3/arch/x86/kernel/init_task.c linux-3.0.3/arch/x86/kernel/init_task.c
---- linux-3.0.3/arch/x86/kernel/init_task.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/init_task.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/init_task.c linux-3.0.4/arch/x86/kernel/init_task.c
+--- linux-3.0.4/arch/x86/kernel/init_task.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/init_task.c	2011-08-23 21:47:55.000000000 -0400
 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
   * way process stacks are handled. This is done by having a special
   * "init_task" linker map entry..
@@ -13172,9 +13165,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/init_task.c linux-3.0.3/arch/x86/kernel/i
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-3.0.3/arch/x86/kernel/ioport.c linux-3.0.3/arch/x86/kernel/ioport.c
---- linux-3.0.3/arch/x86/kernel/ioport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ioport.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ioport.c linux-3.0.4/arch/x86/kernel/ioport.c
+--- linux-3.0.4/arch/x86/kernel/ioport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ioport.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -13218,9 +13211,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ioport.c linux-3.0.3/arch/x86/kernel/iopo
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-3.0.3/arch/x86/kernel/irq_32.c linux-3.0.3/arch/x86/kernel/irq_32.c
---- linux-3.0.3/arch/x86/kernel/irq_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/irq_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/irq_32.c linux-3.0.4/arch/x86/kernel/irq_32.c
+--- linux-3.0.4/arch/x86/kernel/irq_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/irq_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -13360,9 +13353,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/irq_32.c linux-3.0.3/arch/x86/kernel/irq_
  		/*
  		 * Shouldn't happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-3.0.3/arch/x86/kernel/irq.c linux-3.0.3/arch/x86/kernel/irq.c
---- linux-3.0.3/arch/x86/kernel/irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/irq.c linux-3.0.4/arch/x86/kernel/irq.c
+--- linux-3.0.4/arch/x86/kernel/irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -13397,9 +13390,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/irq.c linux-3.0.3/arch/x86/kernel/irq.c
  #endif
  	return sum;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/kgdb.c linux-3.0.3/arch/x86/kernel/kgdb.c
---- linux-3.0.3/arch/x86/kernel/kgdb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/kgdb.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/kgdb.c linux-3.0.4/arch/x86/kernel/kgdb.c
+--- linux-3.0.4/arch/x86/kernel/kgdb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/kgdb.c	2011-08-23 21:47:55.000000000 -0400
 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  #ifdef CONFIG_X86_32
  	switch (regno) {
@@ -13438,9 +13431,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/kgdb.c linux-3.0.3/arch/x86/kernel/kgdb.c
  			if (user_mode(regs))
  				return single_step_cont(regs, args);
  			break;
-diff -urNp linux-3.0.3/arch/x86/kernel/kprobes.c linux-3.0.3/arch/x86/kernel/kprobes.c
---- linux-3.0.3/arch/x86/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/kprobes.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kprobes.c
+--- linux-3.0.4/arch/x86/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/kprobes.c	2011-08-23 21:47:55.000000000 -0400
 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
  	} __attribute__((packed)) *insn;
  
@@ -13574,9 +13567,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/kprobes.c linux-3.0.3/arch/x86/kernel/kpr
  	       RELATIVE_ADDR_SIZE);
  
  	insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-3.0.3/arch/x86/kernel/kvm.c linux-3.0.3/arch/x86/kernel/kvm.c
---- linux-3.0.3/arch/x86/kernel/kvm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/kvm.c	2011-08-24 18:10:12.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/kvm.c linux-3.0.4/arch/x86/kernel/kvm.c
+--- linux-3.0.4/arch/x86/kernel/kvm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/kvm.c	2011-08-24 18:10:12.000000000 -0400
 @@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo
  		pv_mmu_ops.set_pud = kvm_set_pud;
  #if PAGETABLE_LEVELS == 4
@@ -13585,9 +13578,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/kvm.c linux-3.0.3/arch/x86/kernel/kvm.c
  #endif
  #endif
  		pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-3.0.3/arch/x86/kernel/ldt.c linux-3.0.3/arch/x86/kernel/ldt.c
---- linux-3.0.3/arch/x86/kernel/ldt.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ldt.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ldt.c linux-3.0.4/arch/x86/kernel/ldt.c
+--- linux-3.0.4/arch/x86/kernel/ldt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ldt.c	2011-08-23 21:47:55.000000000 -0400
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
@@ -13652,9 +13645,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ldt.c linux-3.0.3/arch/x86/kernel/ldt.c
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-3.0.3/arch/x86/kernel/machine_kexec_32.c linux-3.0.3/arch/x86/kernel/machine_kexec_32.c
---- linux-3.0.3/arch/x86/kernel/machine_kexec_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/machine_kexec_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/machine_kexec_32.c linux-3.0.4/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.0.4/arch/x86/kernel/machine_kexec_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/machine_kexec_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -13682,9 +13675,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/machine_kexec_32.c linux-3.0.3/arch/x86/k
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-3.0.3/arch/x86/kernel/microcode_intel.c linux-3.0.3/arch/x86/kernel/microcode_intel.c
---- linux-3.0.3/arch/x86/kernel/microcode_intel.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/microcode_intel.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/microcode_intel.c linux-3.0.4/arch/x86/kernel/microcode_intel.c
+--- linux-3.0.4/arch/x86/kernel/microcode_intel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/microcode_intel.c	2011-08-23 21:47:55.000000000 -0400
 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -13701,9 +13694,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/microcode_intel.c linux-3.0.3/arch/x86/ke
  }
  
  static void microcode_fini_cpu(int cpu)
-diff -urNp linux-3.0.3/arch/x86/kernel/module.c linux-3.0.3/arch/x86/kernel/module.c
---- linux-3.0.3/arch/x86/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/module.c
+--- linux-3.0.4/arch/x86/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,21 +36,66 @@
  #define DEBUGP(fmt...)
  #endif
@@ -13842,9 +13835,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/module.c linux-3.0.3/arch/x86/kernel/modu
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-3.0.3/arch/x86/kernel/paravirt.c linux-3.0.3/arch/x86/kernel/paravirt.c
---- linux-3.0.3/arch/x86/kernel/paravirt.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/paravirt.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/paravirt.c
+--- linux-3.0.4/arch/x86/kernel/paravirt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/paravirt.c	2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
  	return x;
@@ -13993,9 +13986,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/paravirt.c linux-3.0.3/arch/x86/kernel/pa
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c
---- linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
  	arch_spin_lock(lock);
  }
@@ -14005,9 +13998,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.3/arch/x86
  #ifdef CONFIG_SMP
  	.spin_is_locked = __ticket_spin_is_locked,
  	.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-3.0.3/arch/x86/kernel/pci-iommu_table.c linux-3.0.3/arch/x86/kernel/pci-iommu_table.c
---- linux-3.0.3/arch/x86/kernel/pci-iommu_table.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/pci-iommu_table.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/pci-iommu_table.c linux-3.0.4/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.0.4/arch/x86/kernel/pci-iommu_table.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/pci-iommu_table.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2,7 +2,7 @@
  #include <asm/iommu_table.h>
  #include <linux/string.h>
@@ -14026,9 +14019,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/pci-iommu_table.c linux-3.0.3/arch/x86/ke
  	/* Simple cyclic dependency checker. */
  	for (p = start; p < finish; p++) {
  		q = find_dependents_of(start, finish, p);
-diff -urNp linux-3.0.3/arch/x86/kernel/process_32.c linux-3.0.3/arch/x86/kernel/process_32.c
---- linux-3.0.3/arch/x86/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/process_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/process_32.c
+--- linux-3.0.4/arch/x86/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -14115,9 +14108,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process_32.c linux-3.0.3/arch/x86/kernel/
  	return 0;
  }
 -
-diff -urNp linux-3.0.3/arch/x86/kernel/process_64.c linux-3.0.3/arch/x86/kernel/process_64.c
---- linux-3.0.3/arch/x86/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/process_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/process_64.c
+--- linux-3.0.4/arch/x86/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -87,7 +87,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -14182,9 +14175,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process_64.c linux-3.0.3/arch/x86/kernel/
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/process.c
---- linux-3.0.3/arch/x86/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/process.c
+--- linux-3.0.4/arch/x86/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process.c	2011-08-30 18:23:52.000000000 -0400
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -14274,13 +14267,13 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/pro
  {
  	local_irq_disable();
  	/*
-@@ -668,16 +688,34 @@ static int __init idle_setup(char *str)
+@@ -668,16 +688,37 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
 -unsigned long arch_align_stack(unsigned long sp)
 +#ifdef CONFIG_PAX_RANDKSTACK
-+asmlinkage void pax_randomize_kstack(void)
++void pax_randomize_kstack(struct pt_regs *regs)
  {
 -	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
 -		sp -= get_random_int() % 8192;
@@ -14297,6 +14290,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/pro
 +	if (!randomize_va_space)
 +		return;
 +
++	if (v8086_mode(regs))
++		return;
+ 
 +	rdtscl(time);
 +
 +	/* P4 seems to return a 0 LSB, ignore it */
@@ -14313,15 +14309,15 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/pro
 +
 +	thread->sp0 ^= time;
 +	load_sp0(init_tss + smp_processor_id(), thread);
- 
++
 +#ifdef CONFIG_X86_64
 +	percpu_write(kernel_stack, thread->sp0);
 +#endif
 +}
 +#endif
-diff -urNp linux-3.0.3/arch/x86/kernel/ptrace.c linux-3.0.3/arch/x86/kernel/ptrace.c
---- linux-3.0.3/arch/x86/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ptrace.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptrace.c
+--- linux-3.0.4/arch/x86/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ptrace.c	2011-08-23 21:47:55.000000000 -0400
 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
  		 unsigned long addr, unsigned long data)
  {
@@ -14357,9 +14353,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ptrace.c linux-3.0.3/arch/x86/kernel/ptra
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-3.0.3/arch/x86/kernel/pvclock.c linux-3.0.3/arch/x86/kernel/pvclock.c
---- linux-3.0.3/arch/x86/kernel/pvclock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/pvclock.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/pvclock.c linux-3.0.4/arch/x86/kernel/pvclock.c
+--- linux-3.0.4/arch/x86/kernel/pvclock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/pvclock.c	2011-08-23 21:47:55.000000000 -0400
 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
  	return pv_tsc_khz;
  }
@@ -14388,9 +14384,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/pvclock.c linux-3.0.3/arch/x86/kernel/pvc
  	} while (unlikely(last != ret));
  
  	return ret;
-diff -urNp linux-3.0.3/arch/x86/kernel/reboot.c linux-3.0.3/arch/x86/kernel/reboot.c
---- linux-3.0.3/arch/x86/kernel/reboot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/reboot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/reboot.c linux-3.0.4/arch/x86/kernel/reboot.c
+--- linux-3.0.4/arch/x86/kernel/reboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/reboot.c	2011-08-23 21:47:55.000000000 -0400
 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -14522,9 +14518,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/reboot.c linux-3.0.3/arch/x86/kernel/rebo
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-3.0.3/arch/x86/kernel/setup.c linux-3.0.3/arch/x86/kernel/setup.c
---- linux-3.0.3/arch/x86/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/setup.c linux-3.0.4/arch/x86/kernel/setup.c
+--- linux-3.0.4/arch/x86/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
 @@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
  	 * area (640->1Mb) as ram even though it is not.
  	 * take them out.
@@ -14554,9 +14550,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/setup.c linux-3.0.3/arch/x86/kernel/setup
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-3.0.3/arch/x86/kernel/setup_percpu.c linux-3.0.3/arch/x86/kernel/setup_percpu.c
---- linux-3.0.3/arch/x86/kernel/setup_percpu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/setup_percpu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/setup_percpu.c linux-3.0.4/arch/x86/kernel/setup_percpu.c
+--- linux-3.0.4/arch/x86/kernel/setup_percpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/setup_percpu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -14620,9 +14616,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/setup_percpu.c linux-3.0.3/arch/x86/kerne
  		/*
  		 * Up to this point, the boot CPU has been using .init.data
  		 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-3.0.3/arch/x86/kernel/signal.c linux-3.0.3/arch/x86/kernel/signal.c
---- linux-3.0.3/arch/x86/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/signal.c
+--- linux-3.0.4/arch/x86/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
  	 * Align the stack pointer according to the i386 ABI,
  	 * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -14706,9 +14702,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/signal.c linux-3.0.3/arch/x86/kernel/sign
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-3.0.3/arch/x86/kernel/smpboot.c linux-3.0.3/arch/x86/kernel/smpboot.c
---- linux-3.0.3/arch/x86/kernel/smpboot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/smpboot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/smpboot.c linux-3.0.4/arch/x86/kernel/smpboot.c
+--- linux-3.0.4/arch/x86/kernel/smpboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/smpboot.c	2011-08-23 21:47:55.000000000 -0400
 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
  	set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
@@ -14746,9 +14742,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/smpboot.c linux-3.0.3/arch/x86/kernel/smp
  	err = do_boot_cpu(apicid, cpu);
  	if (err) {
  		pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-3.0.3/arch/x86/kernel/step.c linux-3.0.3/arch/x86/kernel/step.c
---- linux-3.0.3/arch/x86/kernel/step.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/step.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/step.c linux-3.0.4/arch/x86/kernel/step.c
+--- linux-3.0.4/arch/x86/kernel/step.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/step.c	2011-08-23 21:47:55.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
@@ -14791,17 +14787,17 @@ diff -urNp linux-3.0.3/arch/x86/kernel/step.c linux-3.0.3/arch/x86/kernel/step.c
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-3.0.3/arch/x86/kernel/syscall_table_32.S linux-3.0.3/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.3/arch/x86/kernel/syscall_table_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/syscall_table_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/syscall_table_32.S linux-3.0.4/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.4/arch/x86/kernel/syscall_table_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/syscall_table_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
  	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
  	.long sys_exit
-diff -urNp linux-3.0.3/arch/x86/kernel/sys_i386_32.c linux-3.0.3/arch/x86/kernel/sys_i386_32.c
---- linux-3.0.3/arch/x86/kernel/sys_i386_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/sys_i386_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/sys_i386_32.c linux-3.0.4/arch/x86/kernel/sys_i386_32.c
+--- linux-3.0.4/arch/x86/kernel/sys_i386_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/sys_i386_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -15039,9 +15035,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/sys_i386_32.c linux-3.0.3/arch/x86/kernel
 +
 +	return addr;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/sys_x86_64.c linux-3.0.3/arch/x86/kernel/sys_x86_64.c
---- linux-3.0.3/arch/x86/kernel/sys_x86_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/sys_x86_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/sys_x86_64.c linux-3.0.4/arch/x86/kernel/sys_x86_64.c
+--- linux-3.0.4/arch/x86/kernel/sys_x86_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/sys_x86_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -15179,9 +15175,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/sys_x86_64.c linux-3.0.3/arch/x86/kernel/
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-3.0.3/arch/x86/kernel/tboot.c linux-3.0.3/arch/x86/kernel/tboot.c
---- linux-3.0.3/arch/x86/kernel/tboot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/tboot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot.c
+--- linux-3.0.4/arch/x86/kernel/tboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/tboot.c	2011-08-23 21:47:55.000000000 -0400
 @@ -217,7 +217,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
@@ -15230,9 +15226,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/tboot.c linux-3.0.3/arch/x86/kernel/tboot
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/time.c linux-3.0.3/arch/x86/kernel/time.c
---- linux-3.0.3/arch/x86/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/time.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/time.c linux-3.0.4/arch/x86/kernel/time.c
+--- linux-3.0.4/arch/x86/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/time.c	2011-08-23 21:47:55.000000000 -0400
 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs 
  {
  	unsigned long pc = instruction_pointer(regs);
@@ -15263,9 +15259,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/time.c linux-3.0.3/arch/x86/kernel/time.c
  	}
  	return pc;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/tls.c linux-3.0.3/arch/x86/kernel/tls.c
---- linux-3.0.3/arch/x86/kernel/tls.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/tls.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/tls.c linux-3.0.4/arch/x86/kernel/tls.c
+--- linux-3.0.4/arch/x86/kernel/tls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/tls.c	2011-08-23 21:47:55.000000000 -0400
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
  	if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
  		return -EINVAL;
@@ -15278,9 +15274,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/tls.c linux-3.0.3/arch/x86/kernel/tls.c
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_32.S linux-3.0.3/arch/x86/kernel/trampoline_32.S
---- linux-3.0.3/arch/x86/kernel/trampoline_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/trampoline_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_32.S linux-3.0.4/arch/x86/kernel/trampoline_32.S
+--- linux-3.0.4/arch/x86/kernel/trampoline_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/trampoline_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -15303,9 +15299,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_32.S linux-3.0.3/arch/x86/kern
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_64.S linux-3.0.3/arch/x86/kernel/trampoline_64.S
---- linux-3.0.3/arch/x86/kernel/trampoline_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/trampoline_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_64.S linux-3.0.4/arch/x86/kernel/trampoline_64.S
+--- linux-3.0.4/arch/x86/kernel/trampoline_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/trampoline_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -90,7 +90,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
@@ -15324,9 +15320,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_64.S linux-3.0.3/arch/x86/kern
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-3.0.3/arch/x86/kernel/traps.c linux-3.0.3/arch/x86/kernel/traps.c
---- linux-3.0.3/arch/x86/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/traps.c linux-3.0.4/arch/x86/kernel/traps.c
+--- linux-3.0.4/arch/x86/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -15506,9 +15502,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/traps.c linux-3.0.3/arch/x86/kernel/traps
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-3.0.3/arch/x86/kernel/verify_cpu.S linux-3.0.3/arch/x86/kernel/verify_cpu.S
---- linux-3.0.3/arch/x86/kernel/verify_cpu.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/verify_cpu.S	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/verify_cpu.S linux-3.0.4/arch/x86/kernel/verify_cpu.S
+--- linux-3.0.4/arch/x86/kernel/verify_cpu.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/verify_cpu.S	2011-08-23 21:48:14.000000000 -0400
 @@ -20,6 +20,7 @@
   *	arch/x86/boot/compressed/head_64.S: Boot cpu verification
   *	arch/x86/kernel/trampoline_64.S: secondary processor verification
@@ -15517,9 +15513,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/verify_cpu.S linux-3.0.3/arch/x86/kernel/
   *
   *	verify_cpu, returns the status of longmode and SSE in register %eax.
   *		0: Success    1: Failure
-diff -urNp linux-3.0.3/arch/x86/kernel/vm86_32.c linux-3.0.3/arch/x86/kernel/vm86_32.c
---- linux-3.0.3/arch/x86/kernel/vm86_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/vm86_32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/vm86_32.c linux-3.0.4/arch/x86/kernel/vm86_32.c
+--- linux-3.0.4/arch/x86/kernel/vm86_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/vm86_32.c	2011-08-23 21:48:14.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -15584,9 +15580,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/vm86_32.c linux-3.0.3/arch/x86/kernel/vm8
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-3.0.3/arch/x86/kernel/vmlinux.lds.S linux-3.0.3/arch/x86/kernel/vmlinux.lds.S
---- linux-3.0.3/arch/x86/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.0.4/arch/x86/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -15849,9 +15845,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/vmlinux.lds.S linux-3.0.3/arch/x86/kernel
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.3/arch/x86/kernel/vsyscall_64.c linux-3.0.3/arch/x86/kernel/vsyscall_64.c
---- linux-3.0.3/arch/x86/kernel/vsyscall_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/vsyscall_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/vsyscall_64.c linux-3.0.4/arch/x86/kernel/vsyscall_64.c
+--- linux-3.0.4/arch/x86/kernel/vsyscall_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/vsyscall_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode);
  DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
  {
@@ -15870,9 +15866,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/vsyscall_64.c linux-3.0.3/arch/x86/kernel
  	  .proc_handler = proc_dointvec },
  	{}
  };
-diff -urNp linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c
---- linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -15882,9 +15878,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.3/arch/x86/ker
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-3.0.3/arch/x86/kernel/xsave.c linux-3.0.3/arch/x86/kernel/xsave.c
---- linux-3.0.3/arch/x86/kernel/xsave.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/xsave.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave.c
+--- linux-3.0.4/arch/x86/kernel/xsave.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/xsave.c	2011-08-23 21:47:55.000000000 -0400
 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -EINVAL;
@@ -15912,9 +15908,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/xsave.c linux-3.0.3/arch/x86/kernel/xsave
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-3.0.3/arch/x86/kvm/emulate.c linux-3.0.3/arch/x86/kvm/emulate.c
---- linux-3.0.3/arch/x86/kvm/emulate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/emulate.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/emulate.c linux-3.0.4/arch/x86/kvm/emulate.c
+--- linux-3.0.4/arch/x86/kvm/emulate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/emulate.c	2011-08-23 21:47:55.000000000 -0400
 @@ -96,7 +96,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
@@ -15949,9 +15945,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/emulate.c linux-3.0.3/arch/x86/kvm/emulate.c
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-3.0.3/arch/x86/kvm/lapic.c linux-3.0.3/arch/x86/kvm/lapic.c
---- linux-3.0.3/arch/x86/kvm/lapic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/lapic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/lapic.c linux-3.0.4/arch/x86/kvm/lapic.c
+--- linux-3.0.4/arch/x86/kvm/lapic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/lapic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -15961,9 +15957,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/lapic.c linux-3.0.3/arch/x86/kvm/lapic.c
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-3.0.3/arch/x86/kvm/mmu.c linux-3.0.3/arch/x86/kvm/mmu.c
---- linux-3.0.3/arch/x86/kvm/mmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/mmu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
+--- linux-3.0.4/arch/x86/kvm/mmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/mmu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
  	pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
@@ -15982,9 +15978,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/mmu.c linux-3.0.3/arch/x86/kvm/mmu.c
  		gentry = 0;
  	kvm_mmu_free_some_pages(vcpu);
  	++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-3.0.3/arch/x86/kvm/paging_tmpl.h linux-3.0.3/arch/x86/kvm/paging_tmpl.h
---- linux-3.0.3/arch/x86/kvm/paging_tmpl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/paging_tmpl.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/paging_tmpl.h
+--- linux-3.0.4/arch/x86/kvm/paging_tmpl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/paging_tmpl.h	2011-08-23 21:48:14.000000000 -0400
 @@ -583,6 +583,8 @@ static int FNAME(page_fault)(struct kvm_
  	unsigned long mmu_seq;
  	bool map_writable;
@@ -16003,9 +15999,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/paging_tmpl.h linux-3.0.3/arch/x86/kvm/pagin
  
  	spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-3.0.3/arch/x86/kvm/svm.c linux-3.0.3/arch/x86/kvm/svm.c
---- linux-3.0.3/arch/x86/kvm/svm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/svm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
+--- linux-3.0.4/arch/x86/kvm/svm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/svm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
  
@@ -16029,9 +16025,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/svm.c linux-3.0.3/arch/x86/kvm/svm.c
  	reload_tss(vcpu);
  
  	local_irq_disable();
-diff -urNp linux-3.0.3/arch/x86/kvm/vmx.c linux-3.0.3/arch/x86/kvm/vmx.c
---- linux-3.0.3/arch/x86/kvm/vmx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/vmx.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
+--- linux-3.0.4/arch/x86/kvm/vmx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/vmx.c	2011-08-23 21:47:55.000000000 -0400
 @@ -797,7 +797,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
@@ -16110,9 +16106,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/vmx.c linux-3.0.3/arch/x86/kvm/vmx.c
  	vmx->launched = 1;
  
  	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-diff -urNp linux-3.0.3/arch/x86/kvm/x86.c linux-3.0.3/arch/x86/kvm/x86.c
---- linux-3.0.3/arch/x86/kvm/x86.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/x86.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
+--- linux-3.0.4/arch/x86/kvm/x86.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/x86.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2057,6 +2057,8 @@ long kvm_arch_dev_ioctl(struct file *fil
  		if (n < msr_list.nmsrs)
  			goto out;
@@ -16187,9 +16183,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/x86.c linux-3.0.3/arch/x86/kvm/x86.c
  {
  	int r;
  	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-diff -urNp linux-3.0.3/arch/x86/lguest/boot.c linux-3.0.3/arch/x86/lguest/boot.c
---- linux-3.0.3/arch/x86/lguest/boot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lguest/boot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lguest/boot.c linux-3.0.4/arch/x86/lguest/boot.c
+--- linux-3.0.4/arch/x86/lguest/boot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lguest/boot.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt
   * Rebooting also tells the Host we're finished, but the RESTART flag tells the
   * Launcher to reboot us.
@@ -16202,9 +16198,9 @@ diff -urNp linux-3.0.3/arch/x86/lguest/boot.c linux-3.0.3/arch/x86/lguest/boot.c
  }
  
  /*G:050
-diff -urNp linux-3.0.3/arch/x86/lib/atomic64_32.c linux-3.0.3/arch/x86/lib/atomic64_32.c
---- linux-3.0.3/arch/x86/lib/atomic64_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/atomic64_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/atomic64_32.c linux-3.0.4/arch/x86/lib/atomic64_32.c
+--- linux-3.0.4/arch/x86/lib/atomic64_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/atomic64_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -16283,9 +16279,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/atomic64_32.c linux-3.0.3/arch/x86/lib/atomi
  long long atomic64_dec_if_positive_386(atomic64_t *v);
  EXPORT_SYMBOL(atomic64_dec_if_positive_386);
  int atomic64_inc_not_zero_386(atomic64_t *v);
-diff -urNp linux-3.0.3/arch/x86/lib/atomic64_386_32.S linux-3.0.3/arch/x86/lib/atomic64_386_32.S
---- linux-3.0.3/arch/x86/lib/atomic64_386_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/atomic64_386_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/atomic64_386_32.S linux-3.0.4/arch/x86/lib/atomic64_386_32.S
+--- linux-3.0.4/arch/x86/lib/atomic64_386_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/atomic64_386_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -48,6 +48,10 @@ BEGIN(read)
  	movl  (v), %eax
  	movl 4(v), %edx
@@ -16541,9 +16537,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/atomic64_386_32.S linux-3.0.3/arch/x86/lib/a
  	js 1f
  	movl %eax,  (v)
  	movl %edx, 4(v)
-diff -urNp linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S
---- linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8)
  	CFI_ENDPROC
  ENDPROC(atomic64_read_cx8)
@@ -16722,9 +16718,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S linux-3.0.3/arch/x86/lib/a
  	LOCK_PREFIX
  	cmpxchg8b (%esi)
  	jne 1b
-diff -urNp linux-3.0.3/arch/x86/lib/checksum_32.S linux-3.0.3/arch/x86/lib/checksum_32.S
---- linux-3.0.3/arch/x86/lib/checksum_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/checksum_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/checksum_32.S linux-3.0.4/arch/x86/lib/checksum_32.S
+--- linux-3.0.4/arch/x86/lib/checksum_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/checksum_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -16969,9 +16965,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/checksum_32.S linux-3.0.3/arch/x86/lib/check
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-3.0.3/arch/x86/lib/clear_page_64.S linux-3.0.3/arch/x86/lib/clear_page_64.S
---- linux-3.0.3/arch/x86/lib/clear_page_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/clear_page_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/clear_page_64.S linux-3.0.4/arch/x86/lib/clear_page_64.S
+--- linux-3.0.4/arch/x86/lib/clear_page_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/clear_page_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -58,7 +58,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -16981,9 +16977,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/clear_page_64.S linux-3.0.3/arch/x86/lib/cle
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:	.byte 0xeb					/* jmp <disp8> */
-diff -urNp linux-3.0.3/arch/x86/lib/copy_page_64.S linux-3.0.3/arch/x86/lib/copy_page_64.S
---- linux-3.0.3/arch/x86/lib/copy_page_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/copy_page_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/copy_page_64.S linux-3.0.4/arch/x86/lib/copy_page_64.S
+--- linux-3.0.4/arch/x86/lib/copy_page_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/copy_page_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -16993,9 +16989,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/copy_page_64.S linux-3.0.3/arch/x86/lib/copy
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-3.0.3/arch/x86/lib/copy_user_64.S linux-3.0.3/arch/x86/lib/copy_user_64.S
---- linux-3.0.3/arch/x86/lib/copy_user_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/copy_user_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy_user_64.S
+--- linux-3.0.4/arch/x86/lib/copy_user_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/copy_user_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <asm/thread_info.h>
  #include <asm/cpufeature.h>
@@ -17057,9 +17053,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/copy_user_64.S linux-3.0.3/arch/x86/lib/copy
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff -urNp linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S
---- linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -17084,9 +17080,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S linux-3.0.3/arch/x86/
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff -urNp linux-3.0.3/arch/x86/lib/csum-wrappers_64.c linux-3.0.3/arch/x86/lib/csum-wrappers_64.c
---- linux-3.0.3/arch/x86/lib/csum-wrappers_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/csum-wrappers_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/csum-wrappers_64.c linux-3.0.4/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.0.4/arch/x86/lib/csum-wrappers_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/csum-wrappers_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
@@ -17113,9 +17109,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/csum-wrappers_64.c linux-3.0.3/arch/x86/lib/
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff -urNp linux-3.0.3/arch/x86/lib/getuser.S linux-3.0.3/arch/x86/lib/getuser.S
---- linux-3.0.3/arch/x86/lib/getuser.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/getuser.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
+--- linux-3.0.4/arch/x86/lib/getuser.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/getuser.S	2011-08-23 21:47:55.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17221,9 +17217,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/getuser.S linux-3.0.3/arch/x86/lib/getuser.S
  4:	movq -7(%_ASM_AX),%_ASM_DX
  	xor %eax,%eax
  	ret
-diff -urNp linux-3.0.3/arch/x86/lib/insn.c linux-3.0.3/arch/x86/lib/insn.c
---- linux-3.0.3/arch/x86/lib/insn.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/insn.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/insn.c linux-3.0.4/arch/x86/lib/insn.c
+--- linux-3.0.4/arch/x86/lib/insn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/insn.c	2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -17247,9 +17243,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/insn.c linux-3.0.3/arch/x86/lib/insn.c
  	insn->x86_64 = x86_64 ? 1 : 0;
  	insn->opnd_bytes = 4;
  	if (x86_64)
-diff -urNp linux-3.0.3/arch/x86/lib/mmx_32.c linux-3.0.3/arch/x86/lib/mmx_32.c
---- linux-3.0.3/arch/x86/lib/mmx_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/mmx_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/mmx_32.c linux-3.0.4/arch/x86/lib/mmx_32.c
+--- linux-3.0.4/arch/x86/lib/mmx_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/mmx_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
@@ -17565,9 +17561,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/mmx_32.c linux-3.0.3/arch/x86/lib/mmx_32.c
  
  		from += 64;
  		to += 64;
-diff -urNp linux-3.0.3/arch/x86/lib/putuser.S linux-3.0.3/arch/x86/lib/putuser.S
---- linux-3.0.3/arch/x86/lib/putuser.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/putuser.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/putuser.S linux-3.0.4/arch/x86/lib/putuser.S
+--- linux-3.0.4/arch/x86/lib/putuser.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/putuser.S	2011-08-23 21:47:55.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -17705,9 +17701,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/putuser.S linux-3.0.3/arch/x86/lib/putuser.S
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-3.0.3/arch/x86/lib/usercopy_32.c linux-3.0.3/arch/x86/lib/usercopy_32.c
---- linux-3.0.3/arch/x86/lib/usercopy_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/usercopy_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/usercopy_32.c linux-3.0.4/arch/x86/lib/usercopy_32.c
+--- linux-3.0.4/arch/x86/lib/usercopy_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/usercopy_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -18328,9 +18324,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/usercopy_32.c linux-3.0.3/arch/x86/lib/userc
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-3.0.3/arch/x86/lib/usercopy_64.c linux-3.0.3/arch/x86/lib/usercopy_64.c
---- linux-3.0.3/arch/x86/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/usercopy_64.c
+--- linux-3.0.4/arch/x86/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -18379,9 +18375,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/usercopy_64.c linux-3.0.3/arch/x86/lib/userc
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.3/arch/x86/Makefile linux-3.0.3/arch/x86/Makefile
---- linux-3.0.3/arch/x86/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Makefile	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Makefile linux-3.0.4/arch/x86/Makefile
+--- linux-3.0.4/arch/x86/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Makefile	2011-08-23 21:48:14.000000000 -0400
 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
  else
          BITS := 64
@@ -18403,9 +18399,9 @@ diff -urNp linux-3.0.3/arch/x86/Makefile linux-3.0.3/arch/x86/Makefile
 +
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-3.0.3/arch/x86/mm/extable.c linux-3.0.3/arch/x86/mm/extable.c
---- linux-3.0.3/arch/x86/mm/extable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/extable.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/extable.c linux-3.0.4/arch/x86/mm/extable.c
+--- linux-3.0.4/arch/x86/mm/extable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/extable.c	2011-08-23 21:47:55.000000000 -0400
 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
  	const struct exception_table_entry *fixup;
  
@@ -18415,9 +18411,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/extable.c linux-3.0.3/arch/x86/mm/extable.c
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-3.0.3/arch/x86/mm/fault.c linux-3.0.3/arch/x86/mm/fault.c
---- linux-3.0.3/arch/x86/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/fault.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
+--- linux-3.0.4/arch/x86/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/fault.c	2011-08-23 21:48:14.000000000 -0400
 @@ -13,10 +13,18 @@
  #include <linux/perf_event.h>		/* perf_sw_event		*/
  #include <linux/hugetlb.h>		/* hstate_index_to_shift	*/
@@ -19084,9 +19080,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/fault.c linux-3.0.3/arch/x86/mm/fault.c
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-3.0.3/arch/x86/mm/gup.c linux-3.0.3/arch/x86/mm/gup.c
---- linux-3.0.3/arch/x86/mm/gup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/gup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/gup.c linux-3.0.4/arch/x86/mm/gup.c
+--- linux-3.0.4/arch/x86/mm/gup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/gup.c	2011-08-23 21:47:55.000000000 -0400
 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -19096,9 +19092,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/gup.c linux-3.0.3/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-3.0.3/arch/x86/mm/highmem_32.c linux-3.0.3/arch/x86/mm/highmem_32.c
---- linux-3.0.3/arch/x86/mm/highmem_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/highmem_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/highmem_32.c linux-3.0.4/arch/x86/mm/highmem_32.c
+--- linux-3.0.4/arch/x86/mm/highmem_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/highmem_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -19110,9 +19106,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/highmem_32.c linux-3.0.3/arch/x86/mm/highmem_
  
  	return (void *)vaddr;
  }
-diff -urNp linux-3.0.3/arch/x86/mm/hugetlbpage.c linux-3.0.3/arch/x86/mm/hugetlbpage.c
---- linux-3.0.3/arch/x86/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/hugetlbpage.c linux-3.0.4/arch/x86/mm/hugetlbpage.c
+--- linux-3.0.4/arch/x86/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -19320,9 +19316,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/hugetlbpage.c linux-3.0.3/arch/x86/mm/hugetlb
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.3/arch/x86/mm/init_32.c linux-3.0.3/arch/x86/mm/init_32.c
---- linux-3.0.3/arch/x86/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/init_32.c linux-3.0.4/arch/x86/mm/init_32.c
+--- linux-3.0.4/arch/x86/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -19597,9 +19593,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/init_32.c linux-3.0.3/arch/x86/mm/init_32.c
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff -urNp linux-3.0.3/arch/x86/mm/init_64.c linux-3.0.3/arch/x86/mm/init_64.c
---- linux-3.0.3/arch/x86/mm/init_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/init_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
+--- linux-3.0.4/arch/x86/mm/init_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/init_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -19711,9 +19707,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/init_64.c linux-3.0.3/arch/x86/mm/init_64.c
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-3.0.3/arch/x86/mm/init.c linux-3.0.3/arch/x86/mm/init.c
---- linux-3.0.3/arch/x86/mm/init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/init.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
+--- linux-3.0.4/arch/x86/mm/init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/init.c	2011-08-23 21:48:14.000000000 -0400
 @@ -31,7 +31,7 @@ int direct_gbpages
  static void __init find_early_table_space(unsigned long end, int use_pse,
  					  int use_gbpages)
@@ -19846,9 +19842,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/init.c linux-3.0.3/arch/x86/mm/init.c
  	free_init_pages("unused kernel memory",
  			(unsigned long)(&__init_begin),
  			(unsigned long)(&__init_end));
-diff -urNp linux-3.0.3/arch/x86/mm/iomap_32.c linux-3.0.3/arch/x86/mm/iomap_32.c
---- linux-3.0.3/arch/x86/mm/iomap_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/iomap_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/iomap_32.c linux-3.0.4/arch/x86/mm/iomap_32.c
+--- linux-3.0.4/arch/x86/mm/iomap_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/iomap_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	type = kmap_atomic_idx_push();
  	idx = type + KM_TYPE_NR * smp_processor_id();
@@ -19861,9 +19857,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/iomap_32.c linux-3.0.3/arch/x86/mm/iomap_32.c
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-3.0.3/arch/x86/mm/ioremap.c linux-3.0.3/arch/x86/mm/ioremap.c
---- linux-3.0.3/arch/x86/mm/ioremap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/ioremap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/ioremap.c linux-3.0.4/arch/x86/mm/ioremap.c
+--- linux-3.0.4/arch/x86/mm/ioremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/ioremap.c	2011-08-23 21:47:55.000000000 -0400
 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
  	for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
  		int is_ram = page_is_ram(pfn);
@@ -19892,9 +19888,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/ioremap.c linux-3.0.3/arch/x86/mm/ioremap.c
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-08-23 21:47:55.000000000 -0400
 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
  	 * memory (e.g. tracked pages)? For now, we need this to avoid
  	 * invoking kmemcheck for PnP BIOS calls.
@@ -19907,9 +19903,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.3/arch/x86/mm
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-3.0.3/arch/x86/mm/mmap.c linux-3.0.3/arch/x86/mm/mmap.c
---- linux-3.0.3/arch/x86/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/mmap.c linux-3.0.4/arch/x86/mm/mmap.c
+--- linux-3.0.4/arch/x86/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -19991,9 +19987,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/mmap.c linux-3.0.3/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.3/arch/x86/mm/mmio-mod.c linux-3.0.3/arch/x86/mm/mmio-mod.c
---- linux-3.0.3/arch/x86/mm/mmio-mod.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/mmio-mod.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/mmio-mod.c linux-3.0.4/arch/x86/mm/mmio-mod.c
+--- linux-3.0.4/arch/x86/mm/mmio-mod.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/mmio-mod.c	2011-08-23 21:47:55.000000000 -0400
 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
  		break;
  	default:
@@ -20021,9 +20017,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/mmio-mod.c linux-3.0.3/arch/x86/mm/mmio-mod.c
  	};
  	map.map_id = trace->id;
  
-diff -urNp linux-3.0.3/arch/x86/mm/pageattr.c linux-3.0.3/arch/x86/mm/pageattr.c
---- linux-3.0.3/arch/x86/mm/pageattr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pageattr.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pageattr.c linux-3.0.4/arch/x86/mm/pageattr.c
+--- linux-3.0.4/arch/x86/mm/pageattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pageattr.c	2011-08-23 21:47:55.000000000 -0400
 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
  	 */
  #ifdef CONFIG_PCI_BIOS
@@ -20108,9 +20104,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pageattr.c linux-3.0.3/arch/x86/mm/pageattr.c
  }
  
  static int
-diff -urNp linux-3.0.3/arch/x86/mm/pageattr-test.c linux-3.0.3/arch/x86/mm/pageattr-test.c
---- linux-3.0.3/arch/x86/mm/pageattr-test.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pageattr-test.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pageattr-test.c linux-3.0.4/arch/x86/mm/pageattr-test.c
+--- linux-3.0.4/arch/x86/mm/pageattr-test.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pageattr-test.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -20120,9 +20116,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pageattr-test.c linux-3.0.3/arch/x86/mm/pagea
  }
  
  struct split_state {
-diff -urNp linux-3.0.3/arch/x86/mm/pat.c linux-3.0.3/arch/x86/mm/pat.c
---- linux-3.0.3/arch/x86/mm/pat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pat.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pat.c linux-3.0.4/arch/x86/mm/pat.c
+--- linux-3.0.4/arch/x86/mm/pat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pat.c	2011-08-23 21:47:55.000000000 -0400
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
  	if (!entry) {
@@ -20170,9 +20166,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pat.c linux-3.0.3/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-3.0.3/arch/x86/mm/pf_in.c linux-3.0.3/arch/x86/mm/pf_in.c
---- linux-3.0.3/arch/x86/mm/pf_in.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pf_in.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pf_in.c linux-3.0.4/arch/x86/mm/pf_in.c
+--- linux-3.0.4/arch/x86/mm/pf_in.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pf_in.c	2011-08-23 21:47:55.000000000 -0400
 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
  	int i;
  	enum reason_type rv = OTHERS;
@@ -20218,9 +20214,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pf_in.c linux-3.0.3/arch/x86/mm/pf_in.c
  	p += skip_prefix(p, &prf);
  	p += get_opcode(p, &opcode);
  	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-3.0.3/arch/x86/mm/pgtable_32.c linux-3.0.3/arch/x86/mm/pgtable_32.c
---- linux-3.0.3/arch/x86/mm/pgtable_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pgtable_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pgtable_32.c linux-3.0.4/arch/x86/mm/pgtable_32.c
+--- linux-3.0.4/arch/x86/mm/pgtable_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pgtable_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
  		return;
  	}
@@ -20235,9 +20231,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pgtable_32.c linux-3.0.3/arch/x86/mm/pgtable_
  
  	/*
  	 * It's enough to flush this one mapping.
-diff -urNp linux-3.0.3/arch/x86/mm/pgtable.c linux-3.0.3/arch/x86/mm/pgtable.c
---- linux-3.0.3/arch/x86/mm/pgtable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pgtable.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pgtable.c linux-3.0.4/arch/x86/mm/pgtable.c
+--- linux-3.0.4/arch/x86/mm/pgtable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pgtable.c	2011-08-23 21:47:55.000000000 -0400
 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
@@ -20483,9 +20479,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pgtable.c linux-3.0.3/arch/x86/mm/pgtable.c
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-3.0.3/arch/x86/mm/setup_nx.c linux-3.0.3/arch/x86/mm/setup_nx.c
---- linux-3.0.3/arch/x86/mm/setup_nx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/setup_nx.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/setup_nx.c linux-3.0.4/arch/x86/mm/setup_nx.c
+--- linux-3.0.4/arch/x86/mm/setup_nx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/setup_nx.c	2011-08-23 21:47:55.000000000 -0400
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -20515,9 +20511,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/setup_nx.c linux-3.0.3/arch/x86/mm/setup_nx.c
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-3.0.3/arch/x86/mm/tlb.c linux-3.0.3/arch/x86/mm/tlb.c
---- linux-3.0.3/arch/x86/mm/tlb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/tlb.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/tlb.c linux-3.0.4/arch/x86/mm/tlb.c
+--- linux-3.0.4/arch/x86/mm/tlb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/tlb.c	2011-08-23 21:47:55.000000000 -0400
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -20530,9 +20526,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/tlb.c linux-3.0.3/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-3.0.3/arch/x86/net/bpf_jit_comp.c linux-3.0.3/arch/x86/net/bpf_jit_comp.c
---- linux-3.0.3/arch/x86/net/bpf_jit_comp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/net/bpf_jit_comp.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/net/bpf_jit_comp.c linux-3.0.4/arch/x86/net/bpf_jit_comp.c
+--- linux-3.0.4/arch/x86/net/bpf_jit_comp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/net/bpf_jit_comp.c	2011-08-23 21:47:55.000000000 -0400
 @@ -589,7 +589,9 @@ cond_branch:			f_offset = addrs[i + filt
  					module_free(NULL, image);
  					return;
@@ -20552,9 +20548,9 @@ diff -urNp linux-3.0.3/arch/x86/net/bpf_jit_comp.c linux-3.0.3/arch/x86/net/bpf_
  						   proglen,
  						   sizeof(struct work_struct)));
  			if (!image)
-diff -urNp linux-3.0.3/arch/x86/oprofile/backtrace.c linux-3.0.3/arch/x86/oprofile/backtrace.c
---- linux-3.0.3/arch/x86/oprofile/backtrace.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/oprofile/backtrace.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofile/backtrace.c
+--- linux-3.0.4/arch/x86/oprofile/backtrace.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/x86/oprofile/backtrace.c	2011-08-23 21:47:55.000000000 -0400
 @@ -148,7 +148,7 @@ x86_backtrace(struct pt_regs * const reg
  {
  	struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
@@ -20564,9 +20560,9 @@ diff -urNp linux-3.0.3/arch/x86/oprofile/backtrace.c linux-3.0.3/arch/x86/oprofi
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-3.0.3/arch/x86/pci/mrst.c linux-3.0.3/arch/x86/pci/mrst.c
---- linux-3.0.3/arch/x86/pci/mrst.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/pci/mrst.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/pci/mrst.c linux-3.0.4/arch/x86/pci/mrst.c
+--- linux-3.0.4/arch/x86/pci/mrst.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/pci/mrst.c	2011-08-23 21:47:55.000000000 -0400
 @@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
  	printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
  	pci_mmcfg_late_init();
@@ -20578,9 +20574,9 @@ diff -urNp linux-3.0.3/arch/x86/pci/mrst.c linux-3.0.3/arch/x86/pci/mrst.c
  	/* Continue with standard init */
  	return 1;
  }
-diff -urNp linux-3.0.3/arch/x86/pci/pcbios.c linux-3.0.3/arch/x86/pci/pcbios.c
---- linux-3.0.3/arch/x86/pci/pcbios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/pci/pcbios.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
+--- linux-3.0.4/arch/x86/pci/pcbios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/pci/pcbios.c	2011-08-23 21:47:55.000000000 -0400
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -20885,9 +20881,9 @@ diff -urNp linux-3.0.3/arch/x86/pci/pcbios.c linux-3.0.3/arch/x86/pci/pcbios.c
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_32.c linux-3.0.3/arch/x86/platform/efi/efi_32.c
---- linux-3.0.3/arch/x86/platform/efi/efi_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/efi/efi_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platform/efi/efi_32.c
+--- linux-3.0.4/arch/x86/platform/efi/efi_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/efi/efi_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -38,70 +38,37 @@
   */
  
@@ -20968,9 +20964,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_32.c linux-3.0.3/arch/x86/platf
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S
---- linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -21069,9 +21065,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S linux-3.0.3/arch/x86/
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-3.0.3/arch/x86/platform/mrst/mrst.c linux-3.0.3/arch/x86/platform/mrst/mrst.c
---- linux-3.0.3/arch/x86/platform/mrst/mrst.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/mrst/mrst.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platform/mrst/mrst.c
+--- linux-3.0.4/arch/x86/platform/mrst/mrst.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/mrst/mrst.c	2011-08-23 21:47:55.000000000 -0400
 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
  }
  
@@ -21091,9 +21087,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/mrst/mrst.c linux-3.0.3/arch/x86/platfo
  }
  
  /*
-diff -urNp linux-3.0.3/arch/x86/platform/uv/tlb_uv.c linux-3.0.3/arch/x86/platform/uv/tlb_uv.c
---- linux-3.0.3/arch/x86/platform/uv/tlb_uv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/uv/tlb_uv.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/uv/tlb_uv.c linux-3.0.4/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.0.4/arch/x86/platform/uv/tlb_uv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/uv/tlb_uv.c	2011-08-23 21:48:14.000000000 -0400
 @@ -373,6 +373,8 @@ static void reset_with_ipi(struct bau_ta
  	cpumask_t mask;
  	struct reset_args reset_args;
@@ -21103,9 +21099,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/uv/tlb_uv.c linux-3.0.3/arch/x86/platfo
  	reset_args.sender = sender;
  	cpus_clear(mask);
  	/* find a single cpu for each uvhub in this distribution mask */
-diff -urNp linux-3.0.3/arch/x86/power/cpu.c linux-3.0.3/arch/x86/power/cpu.c
---- linux-3.0.3/arch/x86/power/cpu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/power/cpu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/power/cpu.c linux-3.0.4/arch/x86/power/cpu.c
+--- linux-3.0.4/arch/x86/power/cpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/power/cpu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -21125,9 +21121,9 @@ diff -urNp linux-3.0.3/arch/x86/power/cpu.c linux-3.0.3/arch/x86/power/cpu.c
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-3.0.3/arch/x86/vdso/Makefile linux-3.0.3/arch/x86/vdso/Makefile
---- linux-3.0.3/arch/x86/vdso/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/vdso/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/vdso/Makefile linux-3.0.4/arch/x86/vdso/Makefile
+--- linux-3.0.4/arch/x86/vdso/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/vdso/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO    $@
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
  		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -21137,9 +21133,9 @@ diff -urNp linux-3.0.3/arch/x86/vdso/Makefile linux-3.0.3/arch/x86/vdso/Makefile
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-3.0.3/arch/x86/vdso/vdso32-setup.c linux-3.0.3/arch/x86/vdso/vdso32-setup.c
---- linux-3.0.3/arch/x86/vdso/vdso32-setup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/vdso/vdso32-setup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/vdso/vdso32-setup.c linux-3.0.4/arch/x86/vdso/vdso32-setup.c
+--- linux-3.0.4/arch/x86/vdso/vdso32-setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/vdso/vdso32-setup.c	2011-08-23 21:47:55.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -21222,9 +21218,9 @@ diff -urNp linux-3.0.3/arch/x86/vdso/vdso32-setup.c linux-3.0.3/arch/x86/vdso/vd
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-3.0.3/arch/x86/vdso/vma.c linux-3.0.3/arch/x86/vdso/vma.c
---- linux-3.0.3/arch/x86/vdso/vma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/vdso/vma.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/vdso/vma.c linux-3.0.4/arch/x86/vdso/vma.c
+--- linux-3.0.4/arch/x86/vdso/vma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/vdso/vma.c	2011-08-23 21:47:55.000000000 -0400
 @@ -15,18 +15,19 @@
  #include <asm/proto.h>
  #include <asm/vdso.h>
@@ -21327,9 +21323,9 @@ diff -urNp linux-3.0.3/arch/x86/vdso/vma.c linux-3.0.3/arch/x86/vdso/vma.c
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-3.0.3/arch/x86/xen/enlighten.c linux-3.0.3/arch/x86/xen/enlighten.c
---- linux-3.0.3/arch/x86/xen/enlighten.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/enlighten.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlighten.c
+--- linux-3.0.4/arch/x86/xen/enlighten.c	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/enlighten.c	2011-08-29 23:26:21.000000000 -0400
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -21402,10 +21398,10 @@ diff -urNp linux-3.0.3/arch/x86/xen/enlighten.c linux-3.0.3/arch/x86/xen/enlight
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
---- linux-3.0.3/arch/x86/xen/mmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/mmu.c	2011-08-24 18:10:12.000000000 -0400
-@@ -1679,6 +1679,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
+diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
+--- linux-3.0.4/arch/x86/xen/mmu.c	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/mmu.c	2011-08-29 23:26:21.000000000 -0400
+@@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
  	convert_pfn_mfn(level3_kernel_pgt);
@@ -21414,7 +21410,7 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  
  	l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
  	l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1697,7 +1699,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
+@@ -1701,7 +1703,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -21425,7 +21421,7 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-@@ -1909,6 +1914,7 @@ static void __init xen_post_allocator_in
+@@ -1913,6 +1918,7 @@ static void __init xen_post_allocator_in
  	pv_mmu_ops.set_pud = xen_set_pud;
  #if PAGETABLE_LEVELS == 4
  	pv_mmu_ops.set_pgd = xen_set_pgd;
@@ -21433,7 +21429,7 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  #endif
  
  	/* This will work as long as patching hasn't happened yet
-@@ -1990,6 +1996,7 @@ static const struct pv_mmu_ops xen_mmu_o
+@@ -1994,6 +2000,7 @@ static const struct pv_mmu_ops xen_mmu_o
  	.pud_val = PV_CALLEE_SAVE(xen_pud_val),
  	.make_pud = PV_CALLEE_SAVE(xen_make_pud),
  	.set_pgd = xen_set_pgd_hyper,
@@ -21441,9 +21437,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  
  	.alloc_pud = xen_alloc_pmd_init,
  	.release_pud = xen_release_pmd_init,
-diff -urNp linux-3.0.3/arch/x86/xen/smp.c linux-3.0.3/arch/x86/xen/smp.c
---- linux-3.0.3/arch/x86/xen/smp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/smp.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
+--- linux-3.0.4/arch/x86/xen/smp.c	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/smp.c	2011-08-29 23:26:21.000000000 -0400
 @@ -193,11 +193,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
@@ -21488,9 +21484,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/smp.c linux-3.0.3/arch/x86/xen/smp.c
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-3.0.3/arch/x86/xen/xen-asm_32.S linux-3.0.3/arch/x86/xen/xen-asm_32.S
---- linux-3.0.3/arch/x86/xen/xen-asm_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/xen-asm_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/xen-asm_32.S linux-3.0.4/arch/x86/xen/xen-asm_32.S
+--- linux-3.0.4/arch/x86/xen/xen-asm_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/xen-asm_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -21512,9 +21508,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/xen-asm_32.S linux-3.0.3/arch/x86/xen/xen-as
  #else
  	movl xen_vcpu, %eax
  #endif
-diff -urNp linux-3.0.3/arch/x86/xen/xen-head.S linux-3.0.3/arch/x86/xen/xen-head.S
---- linux-3.0.3/arch/x86/xen/xen-head.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/xen-head.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/xen-head.S linux-3.0.4/arch/x86/xen/xen-head.S
+--- linux-3.0.4/arch/x86/xen/xen-head.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/xen-head.S	2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -21533,9 +21529,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/xen-head.S linux-3.0.3/arch/x86/xen/xen-head
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-3.0.3/arch/x86/xen/xen-ops.h linux-3.0.3/arch/x86/xen/xen-ops.h
---- linux-3.0.3/arch/x86/xen/xen-ops.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/xen-ops.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/xen-ops.h linux-3.0.4/arch/x86/xen/xen-ops.h
+--- linux-3.0.4/arch/x86/xen/xen-ops.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/xen-ops.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -21545,9 +21541,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/xen-ops.h linux-3.0.3/arch/x86/xen/xen-ops.h
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-3.0.3/block/blk-iopoll.c linux-3.0.3/block/blk-iopoll.c
---- linux-3.0.3/block/blk-iopoll.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/blk-iopoll.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/blk-iopoll.c linux-3.0.4/block/blk-iopoll.c
+--- linux-3.0.4/block/blk-iopoll.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/blk-iopoll.c	2011-08-23 21:47:55.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -21557,9 +21553,9 @@ diff -urNp linux-3.0.3/block/blk-iopoll.c linux-3.0.3/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-3.0.3/block/blk-map.c linux-3.0.3/block/blk-map.c
---- linux-3.0.3/block/blk-map.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/blk-map.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/blk-map.c linux-3.0.4/block/blk-map.c
+--- linux-3.0.4/block/blk-map.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/blk-map.c	2011-08-23 21:47:55.000000000 -0400
 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
  	if (!len || !kbuf)
  		return -EINVAL;
@@ -21569,9 +21565,9 @@ diff -urNp linux-3.0.3/block/blk-map.c linux-3.0.3/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-3.0.3/block/blk-softirq.c linux-3.0.3/block/blk-softirq.c
---- linux-3.0.3/block/blk-softirq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/blk-softirq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/blk-softirq.c linux-3.0.4/block/blk-softirq.c
+--- linux-3.0.4/block/blk-softirq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/blk-softirq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -21581,9 +21577,9 @@ diff -urNp linux-3.0.3/block/blk-softirq.c linux-3.0.3/block/blk-softirq.c
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-3.0.3/block/bsg.c linux-3.0.3/block/bsg.c
---- linux-3.0.3/block/bsg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/bsg.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
+--- linux-3.0.4/block/bsg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/bsg.c	2011-08-23 21:47:55.000000000 -0400
 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
  				struct sg_io_v4 *hdr, struct bsg_device *bd,
  				fmode_t has_write_perm)
@@ -21611,9 +21607,9 @@ diff -urNp linux-3.0.3/block/bsg.c linux-3.0.3/block/bsg.c
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-diff -urNp linux-3.0.3/block/scsi_ioctl.c linux-3.0.3/block/scsi_ioctl.c
---- linux-3.0.3/block/scsi_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/scsi_ioctl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/scsi_ioctl.c linux-3.0.4/block/scsi_ioctl.c
+--- linux-3.0.4/block/scsi_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/scsi_ioctl.c	2011-08-23 21:47:55.000000000 -0400
 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -21665,9 +21661,9 @@ diff -urNp linux-3.0.3/block/scsi_ioctl.c linux-3.0.3/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-3.0.3/crypto/cryptd.c linux-3.0.3/crypto/cryptd.c
---- linux-3.0.3/crypto/cryptd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/crypto/cryptd.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/crypto/cryptd.c linux-3.0.4/crypto/cryptd.c
+--- linux-3.0.4/crypto/cryptd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/crypto/cryptd.c	2011-08-23 21:47:55.000000000 -0400
 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
  
  struct cryptd_blkcipher_request_ctx {
@@ -21686,9 +21682,9 @@ diff -urNp linux-3.0.3/crypto/cryptd.c linux-3.0.3/crypto/cryptd.c
  
  static void cryptd_queue_worker(struct work_struct *work);
  
-diff -urNp linux-3.0.3/crypto/gf128mul.c linux-3.0.3/crypto/gf128mul.c
---- linux-3.0.3/crypto/gf128mul.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/crypto/gf128mul.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/crypto/gf128mul.c linux-3.0.4/crypto/gf128mul.c
+--- linux-3.0.4/crypto/gf128mul.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/crypto/gf128mul.c	2011-08-23 21:47:55.000000000 -0400
 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
  	for (i = 0; i < 7; ++i)
  		gf128mul_x_lle(&p[i + 1], &p[i]);
@@ -21707,9 +21703,9 @@ diff -urNp linux-3.0.3/crypto/gf128mul.c linux-3.0.3/crypto/gf128mul.c
  	for (i = 0;;) {
  		u8 ch = ((u8 *)b)[i];
  
-diff -urNp linux-3.0.3/crypto/serpent.c linux-3.0.3/crypto/serpent.c
---- linux-3.0.3/crypto/serpent.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/crypto/serpent.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/crypto/serpent.c linux-3.0.4/crypto/serpent.c
+--- linux-3.0.4/crypto/serpent.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/crypto/serpent.c	2011-08-23 21:48:14.000000000 -0400
 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
  	u32 r0,r1,r2,r3,r4;
  	int i;
@@ -21719,9 +21715,9 @@ diff -urNp linux-3.0.3/crypto/serpent.c linux-3.0.3/crypto/serpent.c
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff -urNp linux-3.0.3/Documentation/dontdiff linux-3.0.3/Documentation/dontdiff
---- linux-3.0.3/Documentation/dontdiff	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/Documentation/dontdiff	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
+--- linux-3.0.4/Documentation/dontdiff	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/Documentation/dontdiff	2011-08-23 21:47:55.000000000 -0400
 @@ -5,6 +5,7 @@
  *.cis
  *.cpio
@@ -21832,9 +21828,9 @@ diff -urNp linux-3.0.3/Documentation/dontdiff linux-3.0.3/Documentation/dontdiff
  wakeup.bin
  wakeup.elf
  wakeup.lds
-diff -urNp linux-3.0.3/Documentation/kernel-parameters.txt linux-3.0.3/Documentation/kernel-parameters.txt
---- linux-3.0.3/Documentation/kernel-parameters.txt	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/Documentation/kernel-parameters.txt	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/Documentation/kernel-parameters.txt linux-3.0.4/Documentation/kernel-parameters.txt
+--- linux-3.0.4/Documentation/kernel-parameters.txt	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/Documentation/kernel-parameters.txt	2011-08-23 21:47:55.000000000 -0400
 @@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
  			the specified number of seconds.  This is to be used if
  			your oopses keep scrolling off the screen.
@@ -21849,9 +21845,9 @@ diff -urNp linux-3.0.3/Documentation/kernel-parameters.txt linux-3.0.3/Documenta
  	pcbit=		[HW,ISDN]
  
  	pcd.		[PARIDE]
-diff -urNp linux-3.0.3/drivers/acpi/apei/cper.c linux-3.0.3/drivers/acpi/apei/cper.c
---- linux-3.0.3/drivers/acpi/apei/cper.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/apei/cper.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/apei/cper.c linux-3.0.4/drivers/acpi/apei/cper.c
+--- linux-3.0.4/drivers/acpi/apei/cper.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/apei/cper.c	2011-08-23 21:47:55.000000000 -0400
 @@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
@@ -21869,9 +21865,9 @@ diff -urNp linux-3.0.3/drivers/acpi/apei/cper.c linux-3.0.3/drivers/acpi/apei/cp
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-3.0.3/drivers/acpi/ec_sys.c linux-3.0.3/drivers/acpi/ec_sys.c
---- linux-3.0.3/drivers/acpi/ec_sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/ec_sys.c	2011-08-24 19:06:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/ec_sys.c linux-3.0.4/drivers/acpi/ec_sys.c
+--- linux-3.0.4/drivers/acpi/ec_sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/ec_sys.c	2011-08-24 19:06:55.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/kernel.h>
  #include <linux/acpi.h>
@@ -21921,9 +21917,9 @@ diff -urNp linux-3.0.3/drivers/acpi/ec_sys.c linux-3.0.3/drivers/acpi/ec_sys.c
  		err = ec_write(*off, byte_write);
  		if (err)
  			return err;
-diff -urNp linux-3.0.3/drivers/acpi/proc.c linux-3.0.3/drivers/acpi/proc.c
---- linux-3.0.3/drivers/acpi/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/proc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/proc.c linux-3.0.4/drivers/acpi/proc.c
+--- linux-3.0.4/drivers/acpi/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/proc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
@@ -21958,9 +21954,9 @@ diff -urNp linux-3.0.3/drivers/acpi/proc.c linux-3.0.3/drivers/acpi/proc.c
  			if (device_can_wakeup(&dev->dev)) {
  				bool enable = !device_may_wakeup(&dev->dev);
  				device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-3.0.3/drivers/acpi/processor_driver.c linux-3.0.3/drivers/acpi/processor_driver.c
---- linux-3.0.3/drivers/acpi/processor_driver.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/processor_driver.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/processor_driver.c linux-3.0.4/drivers/acpi/processor_driver.c
+--- linux-3.0.4/drivers/acpi/processor_driver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/processor_driver.c	2011-08-23 21:47:55.000000000 -0400
 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  #endif
@@ -21970,9 +21966,9 @@ diff -urNp linux-3.0.3/drivers/acpi/processor_driver.c linux-3.0.3/drivers/acpi/
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-3.0.3/drivers/ata/libata-core.c linux-3.0.3/drivers/ata/libata-core.c
---- linux-3.0.3/drivers/ata/libata-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ata/libata-core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-core.c
+--- linux-3.0.4/drivers/ata/libata-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ata/libata-core.c	2011-08-23 21:47:55.000000000 -0400
 @@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
@@ -22010,9 +22006,9 @@ diff -urNp linux-3.0.3/drivers/ata/libata-core.c linux-3.0.3/drivers/ata/libata-
  	spin_unlock(&lock);
  }
  
-diff -urNp linux-3.0.3/drivers/ata/libata-eh.c linux-3.0.3/drivers/ata/libata-eh.c
---- linux-3.0.3/drivers/ata/libata-eh.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ata/libata-eh.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ata/libata-eh.c linux-3.0.4/drivers/ata/libata-eh.c
+--- linux-3.0.4/drivers/ata/libata-eh.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ata/libata-eh.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
  {
  	struct ata_link *link;
@@ -22022,9 +22018,9 @@ diff -urNp linux-3.0.3/drivers/ata/libata-eh.c linux-3.0.3/drivers/ata/libata-eh
  	ata_for_each_link(link, ap, HOST_FIRST)
  		ata_eh_link_report(link);
  }
-diff -urNp linux-3.0.3/drivers/ata/pata_arasan_cf.c linux-3.0.3/drivers/ata/pata_arasan_cf.c
---- linux-3.0.3/drivers/ata/pata_arasan_cf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ata/pata_arasan_cf.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ata/pata_arasan_cf.c linux-3.0.4/drivers/ata/pata_arasan_cf.c
+--- linux-3.0.4/drivers/ata/pata_arasan_cf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ata/pata_arasan_cf.c	2011-08-23 21:47:55.000000000 -0400
 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
  	/* Handle platform specific quirks */
  	if (pdata->quirk) {
@@ -22036,9 +22032,9 @@ diff -urNp linux-3.0.3/drivers/ata/pata_arasan_cf.c linux-3.0.3/drivers/ata/pata
  			ap->pio_mask = 0;
  		}
  		if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-3.0.3/drivers/atm/adummy.c linux-3.0.3/drivers/atm/adummy.c
---- linux-3.0.3/drivers/atm/adummy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/adummy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/adummy.c linux-3.0.4/drivers/atm/adummy.c
+--- linux-3.0.4/drivers/atm/adummy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/adummy.c	2011-08-23 21:47:55.000000000 -0400
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
@@ -22048,9 +22044,9 @@ diff -urNp linux-3.0.3/drivers/atm/adummy.c linux-3.0.3/drivers/atm/adummy.c
  
  	return 0;
  }
-diff -urNp linux-3.0.3/drivers/atm/ambassador.c linux-3.0.3/drivers/atm/ambassador.c
---- linux-3.0.3/drivers/atm/ambassador.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/ambassador.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassador.c
+--- linux-3.0.4/drivers/atm/ambassador.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/ambassador.c	2011-08-23 21:47:55.000000000 -0400
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -22087,9 +22083,9 @@ diff -urNp linux-3.0.3/drivers/atm/ambassador.c linux-3.0.3/drivers/atm/ambassad
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-3.0.3/drivers/atm/atmtcp.c linux-3.0.3/drivers/atm/atmtcp.c
---- linux-3.0.3/drivers/atm/atmtcp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/atmtcp.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/atmtcp.c linux-3.0.4/drivers/atm/atmtcp.c
+--- linux-3.0.4/drivers/atm/atmtcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/atmtcp.c	2011-08-23 21:47:55.000000000 -0400
 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -22139,9 +22135,9 @@ diff -urNp linux-3.0.3/drivers/atm/atmtcp.c linux-3.0.3/drivers/atm/atmtcp.c
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-3.0.3/drivers/atm/eni.c linux-3.0.3/drivers/atm/eni.c
---- linux-3.0.3/drivers/atm/eni.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/eni.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/eni.c linux-3.0.4/drivers/atm/eni.c
+--- linux-3.0.4/drivers/atm/eni.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/eni.c	2011-08-23 21:47:55.000000000 -0400
 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
@@ -22187,9 +22183,9 @@ diff -urNp linux-3.0.3/drivers/atm/eni.c linux-3.0.3/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-3.0.3/drivers/atm/firestream.c linux-3.0.3/drivers/atm/firestream.c
---- linux-3.0.3/drivers/atm/firestream.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/firestream.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestream.c
+--- linux-3.0.4/drivers/atm/firestream.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/firestream.c	2011-08-23 21:47:55.000000000 -0400
 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
  				}
  			}
@@ -22223,9 +22219,9 @@ diff -urNp linux-3.0.3/drivers/atm/firestream.c linux-3.0.3/drivers/atm/firestre
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-3.0.3/drivers/atm/fore200e.c linux-3.0.3/drivers/atm/fore200e.c
---- linux-3.0.3/drivers/atm/fore200e.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/fore200e.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/fore200e.c linux-3.0.4/drivers/atm/fore200e.c
+--- linux-3.0.4/drivers/atm/fore200e.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/fore200e.c	2011-08-23 21:47:55.000000000 -0400
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
@@ -22282,9 +22278,9 @@ diff -urNp linux-3.0.3/drivers/atm/fore200e.c linux-3.0.3/drivers/atm/fore200e.c
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-3.0.3/drivers/atm/he.c linux-3.0.3/drivers/atm/he.c
---- linux-3.0.3/drivers/atm/he.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/he.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/he.c linux-3.0.4/drivers/atm/he.c
+--- linux-3.0.4/drivers/atm/he.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/he.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22366,9 +22362,9 @@ diff -urNp linux-3.0.3/drivers/atm/he.c linux-3.0.3/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-3.0.3/drivers/atm/horizon.c linux-3.0.3/drivers/atm/horizon.c
---- linux-3.0.3/drivers/atm/horizon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/horizon.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
+--- linux-3.0.4/drivers/atm/horizon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/horizon.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22387,9 +22383,9 @@ diff -urNp linux-3.0.3/drivers/atm/horizon.c linux-3.0.3/drivers/atm/horizon.c
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-3.0.3/drivers/atm/idt77252.c linux-3.0.3/drivers/atm/idt77252.c
---- linux-3.0.3/drivers/atm/idt77252.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/idt77252.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
+--- linux-3.0.4/drivers/atm/idt77252.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/idt77252.c	2011-08-23 21:47:55.000000000 -0400
 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
@@ -22544,9 +22540,9 @@ diff -urNp linux-3.0.3/drivers/atm/idt77252.c linux-3.0.3/drivers/atm/idt77252.c
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-3.0.3/drivers/atm/iphase.c linux-3.0.3/drivers/atm/iphase.c
---- linux-3.0.3/drivers/atm/iphase.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/iphase.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
+--- linux-3.0.4/drivers/atm/iphase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/iphase.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1120,7 +1120,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	status = (u_short) (buf_desc_ptr->desc_mode);  
  	if (status & (RX_CER | RX_PTE | RX_OFL))  
@@ -22643,9 +22639,9 @@ diff -urNp linux-3.0.3/drivers/atm/iphase.c linux-3.0.3/drivers/atm/iphase.c
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-3.0.3/drivers/atm/lanai.c linux-3.0.3/drivers/atm/lanai.c
---- linux-3.0.3/drivers/atm/lanai.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/lanai.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/lanai.c linux-3.0.4/drivers/atm/lanai.c
+--- linux-3.0.4/drivers/atm/lanai.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/lanai.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
  	vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
  	lanai_endtx(lanai, lvcc);
@@ -22700,9 +22696,9 @@ diff -urNp linux-3.0.3/drivers/atm/lanai.c linux-3.0.3/drivers/atm/lanai.c
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-3.0.3/drivers/atm/nicstar.c linux-3.0.3/drivers/atm/nicstar.c
---- linux-3.0.3/drivers/atm/nicstar.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/nicstar.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/nicstar.c linux-3.0.4/drivers/atm/nicstar.c
+--- linux-3.0.4/drivers/atm/nicstar.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/nicstar.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 
  	if ((vc = (vc_map *) vcc->dev_data) == NULL) {
  		printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
@@ -22904,9 +22900,9 @@ diff -urNp linux-3.0.3/drivers/atm/nicstar.c linux-3.0.3/drivers/atm/nicstar.c
  			}
  		}
  
-diff -urNp linux-3.0.3/drivers/atm/solos-pci.c linux-3.0.3/drivers/atm/solos-pci.c
---- linux-3.0.3/drivers/atm/solos-pci.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/solos-pci.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/solos-pci.c linux-3.0.4/drivers/atm/solos-pci.c
+--- linux-3.0.4/drivers/atm/solos-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/solos-pci.c	2011-08-23 21:48:14.000000000 -0400
 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
@@ -22934,9 +22930,9 @@ diff -urNp linux-3.0.3/drivers/atm/solos-pci.c linux-3.0.3/drivers/atm/solos-pci
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-3.0.3/drivers/atm/suni.c linux-3.0.3/drivers/atm/suni.c
---- linux-3.0.3/drivers/atm/suni.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/suni.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/suni.c linux-3.0.4/drivers/atm/suni.c
+--- linux-3.0.4/drivers/atm/suni.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/suni.c	2011-08-23 21:47:55.000000000 -0400
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -22948,9 +22944,9 @@ diff -urNp linux-3.0.3/drivers/atm/suni.c linux-3.0.3/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-3.0.3/drivers/atm/uPD98402.c linux-3.0.3/drivers/atm/uPD98402.c
---- linux-3.0.3/drivers/atm/uPD98402.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/uPD98402.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/uPD98402.c linux-3.0.4/drivers/atm/uPD98402.c
+--- linux-3.0.4/drivers/atm/uPD98402.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/uPD98402.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
@@ -22995,9 +22991,9 @@ diff -urNp linux-3.0.3/drivers/atm/uPD98402.c linux-3.0.3/drivers/atm/uPD98402.c
  	return 0;
  }
  
-diff -urNp linux-3.0.3/drivers/atm/zatm.c linux-3.0.3/drivers/atm/zatm.c
---- linux-3.0.3/drivers/atm/zatm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/zatm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
+--- linux-3.0.4/drivers/atm/zatm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/zatm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
@@ -23025,9 +23021,9 @@ diff -urNp linux-3.0.3/drivers/atm/zatm.c linux-3.0.3/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-3.0.3/drivers/base/power/wakeup.c linux-3.0.3/drivers/base/power/wakeup.c
---- linux-3.0.3/drivers/base/power/wakeup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/base/power/wakeup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/base/power/wakeup.c linux-3.0.4/drivers/base/power/wakeup.c
+--- linux-3.0.4/drivers/base/power/wakeup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/base/power/wakeup.c	2011-08-23 21:47:55.000000000 -0400
 @@ -29,14 +29,14 @@ bool events_check_enabled;
   * They need to be modified together atomically, so it's better to use one
   * atomic variable to hold them both.
@@ -23063,9 +23059,9 @@ diff -urNp linux-3.0.3/drivers/base/power/wakeup.c linux-3.0.3/drivers/base/powe
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/block/cciss.c linux-3.0.3/drivers/block/cciss.c
---- linux-3.0.3/drivers/block/cciss.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/cciss.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
+--- linux-3.0.4/drivers/block/cciss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/cciss.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
@@ -23189,9 +23185,9 @@ diff -urNp linux-3.0.3/drivers/block/cciss.c linux-3.0.3/drivers/block/cciss.c
  	free_irq(h->intr[PERF_MODE_INT], h);
  }
  
-diff -urNp linux-3.0.3/drivers/block/cciss.h linux-3.0.3/drivers/block/cciss.h
---- linux-3.0.3/drivers/block/cciss.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/block/cciss.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cciss.h linux-3.0.4/drivers/block/cciss.h
+--- linux-3.0.4/drivers/block/cciss.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/block/cciss.h	2011-08-23 21:47:55.000000000 -0400
 @@ -100,7 +100,7 @@ struct ctlr_info
  	/* information about each logical volume */
  	drive_info_struct *drv[CISS_MAX_LUN];
@@ -23201,9 +23197,9 @@ diff -urNp linux-3.0.3/drivers/block/cciss.h linux-3.0.3/drivers/block/cciss.h
  
  	/* queue and queue Info */ 
  	struct list_head reqQ;
-diff -urNp linux-3.0.3/drivers/block/cpqarray.c linux-3.0.3/drivers/block/cpqarray.c
---- linux-3.0.3/drivers/block/cpqarray.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/cpqarray.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cpqarray.c linux-3.0.4/drivers/block/cpqarray.c
+--- linux-3.0.4/drivers/block/cpqarray.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/cpqarray.c	2011-08-23 21:48:14.000000000 -0400
 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
  	if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
  		goto Enomem4;
@@ -23329,9 +23325,9 @@ diff -urNp linux-3.0.3/drivers/block/cpqarray.c linux-3.0.3/drivers/block/cpqarr
  		if (done == 0) {
  			udelay(10);	/* a short fixed delay */
  		} else
-diff -urNp linux-3.0.3/drivers/block/cpqarray.h linux-3.0.3/drivers/block/cpqarray.h
---- linux-3.0.3/drivers/block/cpqarray.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/cpqarray.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cpqarray.h linux-3.0.4/drivers/block/cpqarray.h
+--- linux-3.0.4/drivers/block/cpqarray.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/cpqarray.h	2011-08-23 21:47:55.000000000 -0400
 @@ -99,7 +99,7 @@ struct ctlr_info {
  	drv_info_t	drv[NWD];
  	struct proc_dir_entry *proc;
@@ -23341,9 +23337,9 @@ diff -urNp linux-3.0.3/drivers/block/cpqarray.h linux-3.0.3/drivers/block/cpqarr
  
  	cmdlist_t *reqQ;
  	cmdlist_t *cmpQ;
-diff -urNp linux-3.0.3/drivers/block/DAC960.c linux-3.0.3/drivers/block/DAC960.c
---- linux-3.0.3/drivers/block/DAC960.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/DAC960.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/DAC960.c linux-3.0.4/drivers/block/DAC960.c
+--- linux-3.0.4/drivers/block/DAC960.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/DAC960.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
    unsigned long flags;
    int Channel, TargetID;
@@ -23353,9 +23349,9 @@ diff -urNp linux-3.0.3/drivers/block/DAC960.c linux-3.0.3/drivers/block/DAC960.c
    if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
  		DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
  			sizeof(DAC960_SCSI_Inquiry_T) +
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_int.h linux-3.0.3/drivers/block/drbd/drbd_int.h
---- linux-3.0.3/drivers/block/drbd/drbd_int.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_int.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_int.h linux-3.0.4/drivers/block/drbd/drbd_int.h
+--- linux-3.0.4/drivers/block/drbd/drbd_int.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_int.h	2011-08-23 21:47:55.000000000 -0400
 @@ -737,7 +737,7 @@ struct drbd_request;
  struct drbd_epoch {
  	struct list_head list;
@@ -23374,9 +23370,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_int.h linux-3.0.3/drivers/block/d
  	unsigned int peer_seq;
  	spinlock_t peer_seq_lock;
  	unsigned int minor;
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_main.c linux-3.0.3/drivers/block/drbd/drbd_main.c
---- linux-3.0.3/drivers/block/drbd/drbd_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_main.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_main.c linux-3.0.4/drivers/block/drbd/drbd_main.c
+--- linux-3.0.4/drivers/block/drbd/drbd_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_main.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
  	p.sector   = sector;
  	p.block_id = block_id;
@@ -23415,9 +23411,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_main.c linux-3.0.3/drivers/block/
  	mdev->al_writ_cnt  =
  	mdev->bm_writ_cnt  =
  	mdev->read_cnt     =
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_nl.c linux-3.0.3/drivers/block/drbd/drbd_nl.c
---- linux-3.0.3/drivers/block/drbd/drbd_nl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_nl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_nl.c linux-3.0.4/drivers/block/drbd/drbd_nl.c
+--- linux-3.0.4/drivers/block/drbd/drbd_nl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_nl.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
  	module_put(THIS_MODULE);
  }
@@ -23463,9 +23459,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_nl.c linux-3.0.3/drivers/block/dr
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_receiver.c linux-3.0.3/drivers/block/drbd/drbd_receiver.c
---- linux-3.0.3/drivers/block/drbd/drbd_receiver.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_receiver.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_receiver.c linux-3.0.4/drivers/block/drbd/drbd_receiver.c
+--- linux-3.0.4/drivers/block/drbd/drbd_receiver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_receiver.c	2011-08-23 21:47:55.000000000 -0400
 @@ -894,7 +894,7 @@ retry:
  	sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
  	sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -23551,9 +23547,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_receiver.c linux-3.0.3/drivers/bl
  	D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-3.0.3/drivers/block/nbd.c linux-3.0.3/drivers/block/nbd.c
---- linux-3.0.3/drivers/block/nbd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/nbd.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/nbd.c linux-3.0.4/drivers/block/nbd.c
+--- linux-3.0.4/drivers/block/nbd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/nbd.c	2011-08-23 21:48:14.000000000 -0400
 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
  	struct kvec iov;
  	sigset_t blocked, oldset;
@@ -23572,9 +23568,9 @@ diff -urNp linux-3.0.3/drivers/block/nbd.c linux-3.0.3/drivers/block/nbd.c
  	switch (cmd) {
  	case NBD_DISCONNECT: {
  		struct request sreq;
-diff -urNp linux-3.0.3/drivers/char/agp/frontend.c linux-3.0.3/drivers/char/agp/frontend.c
---- linux-3.0.3/drivers/char/agp/frontend.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/agp/frontend.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/agp/frontend.c linux-3.0.4/drivers/char/agp/frontend.c
+--- linux-3.0.4/drivers/char/agp/frontend.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/agp/frontend.c	2011-08-23 21:47:55.000000000 -0400
 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
@@ -23584,9 +23580,9 @@ diff -urNp linux-3.0.3/drivers/char/agp/frontend.c linux-3.0.3/drivers/char/agp/
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-3.0.3/drivers/char/briq_panel.c linux-3.0.3/drivers/char/briq_panel.c
---- linux-3.0.3/drivers/char/briq_panel.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/briq_panel.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/briq_panel.c linux-3.0.4/drivers/char/briq_panel.c
+--- linux-3.0.4/drivers/char/briq_panel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/briq_panel.c	2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -23628,9 +23624,9 @@ diff -urNp linux-3.0.3/drivers/char/briq_panel.c linux-3.0.3/drivers/char/briq_p
  
  	return len;
  }
-diff -urNp linux-3.0.3/drivers/char/genrtc.c linux-3.0.3/drivers/char/genrtc.c
---- linux-3.0.3/drivers/char/genrtc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/genrtc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/genrtc.c linux-3.0.4/drivers/char/genrtc.c
+--- linux-3.0.4/drivers/char/genrtc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/genrtc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
  	switch (cmd) {
  
@@ -23639,9 +23635,9 @@ diff -urNp linux-3.0.3/drivers/char/genrtc.c linux-3.0.3/drivers/char/genrtc.c
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-3.0.3/drivers/char/hpet.c linux-3.0.3/drivers/char/hpet.c
---- linux-3.0.3/drivers/char/hpet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/hpet.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/hpet.c linux-3.0.4/drivers/char/hpet.c
+--- linux-3.0.4/drivers/char/hpet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/hpet.c	2011-08-23 21:47:55.000000000 -0400
 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -23651,9 +23647,9 @@ diff -urNp linux-3.0.3/drivers/char/hpet.c linux-3.0.3/drivers/char/hpet.c
  		  struct hpet_info *info)
  {
  	struct hpet_timer __iomem *timer;
-diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c
---- linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c	2011-08-23 21:48:14.000000000 -0400
 @@ -415,7 +415,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
@@ -23693,9 +23689,9 @@ diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.3/drivers/c
  	si = (struct ipmi_system_interface_addr *) &addr;
  	si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
  	si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c
---- linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c	2011-08-23 21:47:55.000000000 -0400
 @@ -277,7 +277,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
@@ -23726,9 +23722,9 @@ diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.3/drivers/char
  
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-3.0.3/drivers/char/Kconfig linux-3.0.3/drivers/char/Kconfig
---- linux-3.0.3/drivers/char/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/Kconfig linux-3.0.4/drivers/char/Kconfig
+--- linux-3.0.4/drivers/char/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
  
  config DEVKMEM
@@ -23747,9 +23743,9 @@ diff -urNp linux-3.0.3/drivers/char/Kconfig linux-3.0.3/drivers/char/Kconfig
  	default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-3.0.3/drivers/char/mem.c linux-3.0.3/drivers/char/mem.c
---- linux-3.0.3/drivers/char/mem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/mem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
+--- linux-3.0.4/drivers/char/mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -23882,9 +23878,9 @@ diff -urNp linux-3.0.3/drivers/char/mem.c linux-3.0.3/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-3.0.3/drivers/char/nvram.c linux-3.0.3/drivers/char/nvram.c
---- linux-3.0.3/drivers/char/nvram.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/nvram.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/nvram.c linux-3.0.4/drivers/char/nvram.c
+--- linux-3.0.4/drivers/char/nvram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/nvram.c	2011-08-23 21:47:55.000000000 -0400
 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
  
  	spin_unlock_irq(&rtc_lock);
@@ -23894,9 +23890,9 @@ diff -urNp linux-3.0.3/drivers/char/nvram.c linux-3.0.3/drivers/char/nvram.c
  		return -EFAULT;
  
  	*ppos = i;
-diff -urNp linux-3.0.3/drivers/char/random.c linux-3.0.3/drivers/char/random.c
---- linux-3.0.3/drivers/char/random.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/char/random.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/random.c linux-3.0.4/drivers/char/random.c
+--- linux-3.0.4/drivers/char/random.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/char/random.c	2011-08-23 21:48:14.000000000 -0400
 @@ -261,8 +261,13 @@
  /*
   * Configuration information
@@ -23947,9 +23943,9 @@ diff -urNp linux-3.0.3/drivers/char/random.c linux-3.0.3/drivers/char/random.c
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-3.0.3/drivers/char/sonypi.c linux-3.0.3/drivers/char/sonypi.c
---- linux-3.0.3/drivers/char/sonypi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/sonypi.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/sonypi.c linux-3.0.4/drivers/char/sonypi.c
+--- linux-3.0.4/drivers/char/sonypi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/sonypi.c	2011-08-23 21:47:55.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -23988,9 +23984,9 @@ diff -urNp linux-3.0.3/drivers/char/sonypi.c linux-3.0.3/drivers/char/sonypi.c
  	mutex_unlock(&sonypi_device.lock);
  
  	return 0;
-diff -urNp linux-3.0.3/drivers/char/tpm/tpm_bios.c linux-3.0.3/drivers/char/tpm/tpm_bios.c
---- linux-3.0.3/drivers/char/tpm/tpm_bios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/tpm/tpm_bios.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/tpm_bios.c
+--- linux-3.0.4/drivers/char/tpm/tpm_bios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/tpm/tpm_bios.c	2011-08-23 21:47:55.000000000 -0400
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -24031,9 +24027,9 @@ diff -urNp linux-3.0.3/drivers/char/tpm/tpm_bios.c linux-3.0.3/drivers/char/tpm/
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-3.0.3/drivers/char/tpm/tpm.c linux-3.0.3/drivers/char/tpm/tpm.c
---- linux-3.0.3/drivers/char/tpm/tpm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/tpm/tpm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/tpm/tpm.c linux-3.0.4/drivers/char/tpm/tpm.c
+--- linux-3.0.4/drivers/char/tpm/tpm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/tpm/tpm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
  		    chip->vendor.req_complete_val)
  			goto out_recv;
@@ -24052,9 +24048,9 @@ diff -urNp linux-3.0.3/drivers/char/tpm/tpm.c linux-3.0.3/drivers/char/tpm/tpm.c
  	tpm_cmd.header.in = tpm_readpubek_header;
  	err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
  			"attempting to read the PUBEK");
-diff -urNp linux-3.0.3/drivers/crypto/hifn_795x.c linux-3.0.3/drivers/crypto/hifn_795x.c
---- linux-3.0.3/drivers/crypto/hifn_795x.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/crypto/hifn_795x.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/crypto/hifn_795x.c linux-3.0.4/drivers/crypto/hifn_795x.c
+--- linux-3.0.4/drivers/crypto/hifn_795x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/crypto/hifn_795x.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
  		0xCA, 0x34, 0x2B, 0x2E};
  	struct scatterlist sg;
@@ -24064,9 +24060,9 @@ diff -urNp linux-3.0.3/drivers/crypto/hifn_795x.c linux-3.0.3/drivers/crypto/hif
  	memset(src, 0, sizeof(src));
  	memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-3.0.3/drivers/crypto/padlock-aes.c linux-3.0.3/drivers/crypto/padlock-aes.c
---- linux-3.0.3/drivers/crypto/padlock-aes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/crypto/padlock-aes.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/crypto/padlock-aes.c linux-3.0.4/drivers/crypto/padlock-aes.c
+--- linux-3.0.4/drivers/crypto/padlock-aes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/crypto/padlock-aes.c	2011-08-23 21:48:14.000000000 -0400
 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
  	struct crypto_aes_ctx gen_aes;
  	int cpu;
@@ -24076,9 +24072,9 @@ diff -urNp linux-3.0.3/drivers/crypto/padlock-aes.c linux-3.0.3/drivers/crypto/p
  	if (key_len % 8) {
  		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
  		return -EINVAL;
-diff -urNp linux-3.0.3/drivers/edac/edac_pci_sysfs.c linux-3.0.3/drivers/edac/edac_pci_sysfs.c
---- linux-3.0.3/drivers/edac/edac_pci_sysfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/edac/edac_pci_sysfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/edac/edac_pci_sysfs.c linux-3.0.4/drivers/edac/edac_pci_sysfs.c
+--- linux-3.0.4/drivers/edac/edac_pci_sysfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/edac/edac_pci_sysfs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;		/* log 
  static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000;	/* one second workq period */
@@ -24162,21 +24158,9 @@ diff -urNp linux-3.0.3/drivers/edac/edac_pci_sysfs.c linux-3.0.3/drivers/edac/ed
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff -urNp linux-3.0.3/drivers/edac/i7core_edac.c linux-3.0.3/drivers/edac/i7core_edac.c
---- linux-3.0.3/drivers/edac/i7core_edac.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/edac/i7core_edac.c	2011-08-23 21:47:55.000000000 -0400
-@@ -1670,7 +1670,7 @@ static void i7core_mce_output_error(stru
- 	char *type, *optype, *err, *msg;
- 	unsigned long error = m->status & 0x1ff0000l;
- 	u32 optypenum = (m->status >> 4) & 0x07;
--	u32 core_err_cnt = (m->status >> 38) && 0x7fff;
-+	u32 core_err_cnt = (m->status >> 38) & 0x7fff;
- 	u32 dimm = (m->misc >> 16) & 0x3;
- 	u32 channel = (m->misc >> 18) & 0x3;
- 	u32 syndrome = m->misc >> 32;
-diff -urNp linux-3.0.3/drivers/edac/mce_amd.h linux-3.0.3/drivers/edac/mce_amd.h
---- linux-3.0.3/drivers/edac/mce_amd.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/edac/mce_amd.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/edac/mce_amd.h linux-3.0.4/drivers/edac/mce_amd.h
+--- linux-3.0.4/drivers/edac/mce_amd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/edac/mce_amd.h	2011-08-23 21:47:55.000000000 -0400
 @@ -83,7 +83,7 @@ struct amd_decoder_ops {
  	bool (*dc_mce)(u16, u8);
  	bool (*ic_mce)(u16, u8);
@@ -24186,9 +24170,9 @@ diff -urNp linux-3.0.3/drivers/edac/mce_amd.h linux-3.0.3/drivers/edac/mce_amd.h
  
  void amd_report_gart_errors(bool);
  void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
-diff -urNp linux-3.0.3/drivers/firewire/core-card.c linux-3.0.3/drivers/firewire/core-card.c
---- linux-3.0.3/drivers/firewire/core-card.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core-card.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core-card.c linux-3.0.4/drivers/firewire/core-card.c
+--- linux-3.0.4/drivers/firewire/core-card.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core-card.c	2011-08-23 21:47:55.000000000 -0400
 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
  
  void fw_core_remove_card(struct fw_card *card)
@@ -24198,9 +24182,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core-card.c linux-3.0.3/drivers/firewire
  
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-3.0.3/drivers/firewire/core-cdev.c linux-3.0.3/drivers/firewire/core-cdev.c
---- linux-3.0.3/drivers/firewire/core-cdev.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core-cdev.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core-cdev.c linux-3.0.4/drivers/firewire/core-cdev.c
+--- linux-3.0.4/drivers/firewire/core-cdev.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core-cdev.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
@@ -24211,9 +24195,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core-cdev.c linux-3.0.3/drivers/firewire
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-3.0.3/drivers/firewire/core.h linux-3.0.3/drivers/firewire/core.h
---- linux-3.0.3/drivers/firewire/core.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core.h linux-3.0.4/drivers/firewire/core.h
+--- linux-3.0.4/drivers/firewire/core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core.h	2011-08-23 21:47:55.000000000 -0400
 @@ -101,6 +101,7 @@ struct fw_card_driver {
  
  	int (*stop_iso)(struct fw_iso_context *ctx);
@@ -24222,9 +24206,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core.h linux-3.0.3/drivers/firewire/core
  
  void fw_card_initialize(struct fw_card *card,
  		const struct fw_card_driver *driver, struct device *device);
-diff -urNp linux-3.0.3/drivers/firewire/core-transaction.c linux-3.0.3/drivers/firewire/core-transaction.c
---- linux-3.0.3/drivers/firewire/core-transaction.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core-transaction.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core-transaction.c linux-3.0.4/drivers/firewire/core-transaction.c
+--- linux-3.0.4/drivers/firewire/core-transaction.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core-transaction.c	2011-08-23 21:48:14.000000000 -0400
 @@ -37,6 +37,7 @@
  #include <linux/timer.h>
  #include <linux/types.h>
@@ -24242,9 +24226,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core-transaction.c linux-3.0.3/drivers/f
  	init_timer_on_stack(&t.split_timeout_timer);
  	init_completion(&d.done);
  	d.payload = payload;
-diff -urNp linux-3.0.3/drivers/firmware/dmi_scan.c linux-3.0.3/drivers/firmware/dmi_scan.c
---- linux-3.0.3/drivers/firmware/dmi_scan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firmware/dmi_scan.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firmware/dmi_scan.c linux-3.0.4/drivers/firmware/dmi_scan.c
+--- linux-3.0.4/drivers/firmware/dmi_scan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firmware/dmi_scan.c	2011-08-23 21:47:55.000000000 -0400
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -24257,9 +24241,9 @@ diff -urNp linux-3.0.3/drivers/firmware/dmi_scan.c linux-3.0.3/drivers/firmware/
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff -urNp linux-3.0.3/drivers/gpio/vr41xx_giu.c linux-3.0.3/drivers/gpio/vr41xx_giu.c
---- linux-3.0.3/drivers/gpio/vr41xx_giu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpio/vr41xx_giu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpio/vr41xx_giu.c linux-3.0.4/drivers/gpio/vr41xx_giu.c
+--- linux-3.0.4/drivers/gpio/vr41xx_giu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpio/vr41xx_giu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
  	printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
  	       maskl, pendl, maskh, pendh);
@@ -24269,9 +24253,9 @@ diff -urNp linux-3.0.3/drivers/gpio/vr41xx_giu.c linux-3.0.3/drivers/gpio/vr41xx
  
  	return -EINVAL;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c	2011-08-23 21:48:14.000000000 -0400
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
@@ -24290,9 +24274,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.3/drivers/gpu
  	crtc->enabled = drm_helper_crtc_in_use(crtc);
  	if (!crtc->enabled)
  		return true;
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_drv.c linux-3.0.3/drivers/gpu/drm/drm_drv.c
---- linux-3.0.3/drivers/gpu/drm/drm_drv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_drv.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_drv.c linux-3.0.4/drivers/gpu/drm/drm_drv.c
+--- linux-3.0.4/drivers/gpu/drm/drm_drv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_drv.c	2011-08-23 21:47:55.000000000 -0400
 @@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp,
  
  	dev = file_priv->minor->dev;
@@ -24302,9 +24286,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_drv.c linux-3.0.3/drivers/gpu/drm/drm
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_fops.c linux-3.0.3/drivers/gpu/drm/drm_fops.c
---- linux-3.0.3/drivers/gpu/drm/drm_fops.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_fops.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_fops.c linux-3.0.4/drivers/gpu/drm/drm_fops.c
+--- linux-3.0.4/drivers/gpu/drm/drm_fops.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_fops.c	2011-08-23 21:47:55.000000000 -0400
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -24354,9 +24338,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_fops.c linux-3.0.3/drivers/gpu/drm/dr
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_global.c linux-3.0.3/drivers/gpu/drm/drm_global.c
---- linux-3.0.3/drivers/gpu/drm/drm_global.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_global.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_global.c linux-3.0.4/drivers/gpu/drm/drm_global.c
+--- linux-3.0.4/drivers/gpu/drm/drm_global.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_global.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@
  struct drm_global_item {
  	struct mutex mutex;
@@ -24414,9 +24398,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_global.c linux-3.0.3/drivers/gpu/drm/
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_info.c linux-3.0.3/drivers/gpu/drm/drm_info.c
---- linux-3.0.3/drivers/gpu/drm/drm_info.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_info.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_info.c linux-3.0.4/drivers/gpu/drm/drm_info.c
+--- linux-3.0.4/drivers/gpu/drm/drm_info.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_info.c	2011-08-23 21:48:14.000000000 -0400
 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
  	struct drm_local_map *map;
  	struct drm_map_list *r_list;
@@ -24457,9 +24441,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_info.c linux-3.0.3/drivers/gpu/drm/dr
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_ioctl.c linux-3.0.3/drivers/gpu/drm/drm_ioctl.c
---- linux-3.0.3/drivers/gpu/drm/drm_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_ioctl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioctl.c linux-3.0.4/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.0.4/drivers/gpu/drm/drm_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_ioctl.c	2011-08-23 21:47:55.000000000 -0400
 @@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24469,9 +24453,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_ioctl.c linux-3.0.3/drivers/gpu/drm/d
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_lock.c linux-3.0.3/drivers/gpu/drm/drm_lock.c
---- linux-3.0.3/drivers/gpu/drm/drm_lock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_lock.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_lock.c linux-3.0.4/drivers/gpu/drm/drm_lock.c
+--- linux-3.0.4/drivers/gpu/drm/drm_lock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_lock.c	2011-08-23 21:47:55.000000000 -0400
 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
  		if (drm_lock_take(&master->lock, lock->context)) {
  			master->lock.file_priv = file_priv;
@@ -24490,9 +24474,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_lock.c linux-3.0.3/drivers/gpu/drm/dr
  
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
-diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c
---- linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c	2011-08-23 21:47:55.000000000 -0400
 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
@@ -24515,9 +24499,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c linux-3.0.3/drivers/gpu/d
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h
---- linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
  	int page_flipping;
  
@@ -24529,9 +24513,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h linux-3.0.3/drivers/gpu/d
  
  	int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
@@ -24541,9 +24525,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.3/drivers/g
  	for (i = 0; i < I915_NUM_RINGS; i++) {
  		if (IS_GEN6(dev)) {
  			seq_printf(m, "Graphics Interrupt mask (%s):	%08x\n",
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s
  	bool can_switch;
  
@@ -24553,9 +24537,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c linux-3.0.3/drivers/gpu/d
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h
---- linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
  	/* render clock increase/decrease */
  	/* display clock increase/decrease */
@@ -24592,9 +24576,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h linux-3.0.3/drivers/gpu/d
  {
  	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-08-23 21:47:55.000000000 -0400
 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
  		i915_gem_clflush_object(obj);
  
@@ -24604,9 +24588,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.3/dr
  
  	/* The actual obj->write_domain will be updated with
  	 * pending_write_domain after we emit the accumulated flush for all
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler
  	u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
  	struct drm_i915_master_private *master_priv;
@@ -24652,9 +24636,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c linux-3.0.3/drivers/gpu/d
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/intel_display.c linux-3.0.3/drivers/gpu/drm/i915/intel_display.c
---- linux-3.0.3/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.0.4/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
  		wait_event(dev_priv->pending_flip_queue,
@@ -24700,9 +24684,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/intel_display.c linux-3.0.3/drivers/
  cleanup_objs:
  	drm_gem_object_unreference(&work->old_fb_obj->base);
  	drm_gem_object_unreference(&obj->base);
-diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h
---- linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
  	u32 clear_cmd;
  	u32 maccess;
@@ -24715,9 +24699,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h linux-3.0.3/drivers/gpu/drm
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c
---- linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -24754,9 +24738,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c linux-3.0.3/drivers/gpu/drm
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-08-26 19:49:56.000000000 -0400
 @@ -200,7 +200,7 @@ struct methods {
  	const char desc[8];
  	void (*loadbios)(struct drm_device *, uint8_t *);
@@ -24775,9 +24759,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.3/driver
  
  #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -227,7 +227,7 @@ struct nouveau_channel {
  		struct list_head pending;
  		uint32_t sequence;
@@ -24830,9 +24814,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.3/drivers
  	} ttm;
  
  	struct {
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-08-23 21:47:55.000000000 -0400
 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
  		if (USE_REFCNT(dev))
  			sequence = nvchan_rd32(chan, 0x48);
@@ -24851,9 +24835,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.3/drive
  	return 0;
  }
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-08-23 21:47:55.000000000 -0400
 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
  	int trycnt = 0;
  	int ret, i;
@@ -24863,9 +24847,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.3/drivers
  retry:
  	if (++trycnt > 100000) {
  		NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-08-23 21:47:55.000000000 -0400
 @@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc
  	bool can_switch;
  
@@ -24875,9 +24859,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.3/drive
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-08-23 21:47:55.000000000 -0400
 @@ -560,7 +560,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
  			u32 class, u32 mthd, u32 data)
@@ -24887,9 +24871,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.3/drivers/
  	return 0;
  }
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c
---- linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c	2011-08-23 21:47:55.000000000 -0400
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
  	/* GH: Simple idle check.
@@ -24899,9 +24883,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c linux-3.0.3/drivers/gpu/d
  
  	/* We don't support anything other than bus-mastering ring mode,
  	 * but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h
---- linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
  	int is_pci;
  	unsigned long cce_buffers_offset;
@@ -24919,9 +24903,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h linux-3.0.3/drivers/gpu/d
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c
---- linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
  	if (crtc != 0)
  		return 0;
@@ -24940,9 +24924,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c linux-3.0.3/drivers/gpu/d
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_state.c linux-3.0.3/drivers/gpu/drm/r128/r128_state.c
---- linux-3.0.3/drivers/gpu/drm/r128/r128_state.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_state.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_state.c linux-3.0.4/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_state.c	2011-08-23 21:47:55.000000000 -0400
 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -24956,9 +24940,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_state.c linux-3.0.3/drivers/gpu
  }
  
  #endif
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/atom.c linux-3.0.3/drivers/gpu/drm/radeon/atom.c
---- linux-3.0.3/drivers/gpu/drm/radeon/atom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/atom.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/atom.c linux-3.0.4/drivers/gpu/drm/radeon/atom.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/atom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/atom.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c
  	char name[512];
  	int i;
@@ -24968,9 +24952,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/atom.c linux-3.0.3/drivers/gpu/drm
  	ctx->card = card;
  	ctx->bios = bios;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c
---- linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c	2011-08-23 21:47:55.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
@@ -24988,9 +24972,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.3/drivers/g
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c	2011-08-23 21:48:14.000000000 -0400
 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
  	struct radeon_gpio_rec gpio;
  	struct radeon_hpd hpd;
@@ -25000,9 +24984,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.3/driv
  	if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
  		return false;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:47:55.000000000 -0400
 @@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch
  	bool can_switch;
  
@@ -25012,9 +24996,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.3/driver
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:48:14.000000000 -0400
 @@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra
  	uint32_t post_div;
  	u32 pll_out_min, pll_out_max;
@@ -25024,9 +25008,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.3/drive
  	DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
  	freq = freq * 1000;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
  	/* SW interrupt */
@@ -25036,9 +25020,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.3/drivers/g
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-08-23 21:47:55.000000000 -0400
 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
  		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
  		return 0;
@@ -25057,9 +25041,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.3/drivers
  	INIT_LIST_HEAD(&rdev->fence_drv.created);
  	INIT_LIST_HEAD(&rdev->fence_drv.emited);
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon.h linux-3.0.3/drivers/gpu/drm/radeon/radeon.h
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon.h linux-3.0.4/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon.h	2011-08-23 21:47:55.000000000 -0400
 @@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d
   */
  struct radeon_fence_driver {
@@ -25078,9 +25062,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon.h linux-3.0.3/drivers/gpu/d
  
  /*
   * Asic structures
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
  	request = compat_alloc_user_space(sizeof(*request));
  	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -25090,9 +25074,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.3/drivers
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
  	unsigned int ret;
  	RING_LOCALS;
@@ -25113,9 +25097,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.3/drivers/g
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
  	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
  		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -25134,9 +25118,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.3/drivers
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -644,8 +644,10 @@ int radeon_mmap(struct file *filp, struc
  	}
  	if (unlikely(ttm_vm_ops == NULL)) {
@@ -25150,9 +25134,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.3/drivers/g
  	}
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/rs690.c linux-3.0.3/drivers/gpu/drm/radeon/rs690.c
---- linux-3.0.3/drivers/gpu/drm/radeon/rs690.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/rs690.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/rs690.c linux-3.0.4/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/rs690.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/rs690.c	2011-08-23 21:47:55.000000000 -0400
 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
  		if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
  			rdev->pm.sideport_bandwidth.full)
@@ -25166,9 +25150,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/rs690.c linux-3.0.3/drivers/gpu/dr
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff -urNp linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
  static int ttm_pool_mm_shrink(struct shrinker *shrink,
  			      struct shrink_control *sc)
@@ -25181,9 +25165,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.3/drivers/
  	struct ttm_page_pool *pool;
  	int shrink_pages = sc->nr_to_scan;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_drv.h linux-3.0.3/drivers/gpu/drm/via/via_drv.h
---- linux-3.0.3/drivers/gpu/drm/via/via_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/via/via_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_drv.h linux-3.0.4/drivers/gpu/drm/via/via_drv.h
+--- linux-3.0.4/drivers/gpu/drm/via/via_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/via/via_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -25202,9 +25186,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_drv.h linux-3.0.3/drivers/gpu/drm
  	drm_via_state_t hc_state;
  	char pci_buf[VIA_PCI_BUF_SIZE];
  	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_irq.c linux-3.0.3/drivers/gpu/drm/via/via_irq.c
---- linux-3.0.3/drivers/gpu/drm/via/via_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/via/via_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_irq.c linux-3.0.4/drivers/gpu/drm/via/via_irq.c
+--- linux-3.0.4/drivers/gpu/drm/via/via_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/via/via_irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
@@ -25275,9 +25259,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_irq.c linux-3.0.3/drivers/gpu/drm
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -240,7 +240,7 @@ struct vmw_private {
  	 * Fencing and IRQs.
  	 */
@@ -25287,9 +25271,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.3/drivers/g
  	wait_queue_head_t fence_queue;
  	wait_queue_head_t fifo_queue;
  	atomic_t fence_queue_waiters;
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-08-23 21:47:55.000000000 -0400
 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
  	while (!vmw_lag_lt(queue, us)) {
  		spin_lock(&queue->lock);
@@ -25299,9 +25283,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.3/drivers
  		else {
  			fence = list_first_entry(&queue->head,
  						 struct vmw_fence, head);
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-08-23 21:47:55.000000000 -0400
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
  		 (unsigned int) min,
  		 (unsigned int) fifo->capabilities);
@@ -25329,9 +25313,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.3/drivers/
  	} while (*sequence == 0);
  
  	if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-08-23 21:47:55.000000000 -0400
 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
  	 * emitted. Then the fence is stale and signaled.
  	 */
@@ -25350,9 +25334,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.3/drivers/g
  	ret = 0;
  
  	for (;;) {
-diff -urNp linux-3.0.3/drivers/hid/hid-core.c linux-3.0.3/drivers/hid/hid-core.c
---- linux-3.0.3/drivers/hid/hid-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hid/hid-core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
+--- linux-3.0.4/drivers/hid/hid-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hid/hid-core.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1923,7 +1923,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
@@ -25371,9 +25355,9 @@ diff -urNp linux-3.0.3/drivers/hid/hid-core.c linux-3.0.3/drivers/hid/hid-core.c
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff -urNp linux-3.0.3/drivers/hid/usbhid/hiddev.c linux-3.0.3/drivers/hid/usbhid/hiddev.c
---- linux-3.0.3/drivers/hid/usbhid/hiddev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hid/usbhid/hiddev.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hid/usbhid/hiddev.c linux-3.0.4/drivers/hid/usbhid/hiddev.c
+--- linux-3.0.4/drivers/hid/usbhid/hiddev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hid/usbhid/hiddev.c	2011-08-23 21:47:55.000000000 -0400
 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
  		break;
  
@@ -25383,9 +25367,9 @@ diff -urNp linux-3.0.3/drivers/hid/usbhid/hiddev.c linux-3.0.3/drivers/hid/usbhi
  			break;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-3.0.3/drivers/hwmon/acpi_power_meter.c linux-3.0.3/drivers/hwmon/acpi_power_meter.c
---- linux-3.0.3/drivers/hwmon/acpi_power_meter.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hwmon/acpi_power_meter.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hwmon/acpi_power_meter.c linux-3.0.4/drivers/hwmon/acpi_power_meter.c
+--- linux-3.0.4/drivers/hwmon/acpi_power_meter.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hwmon/acpi_power_meter.c	2011-08-23 21:47:55.000000000 -0400
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
  		return res;
  
@@ -25395,9 +25379,9 @@ diff -urNp linux-3.0.3/drivers/hwmon/acpi_power_meter.c linux-3.0.3/drivers/hwmo
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-3.0.3/drivers/hwmon/sht15.c linux-3.0.3/drivers/hwmon/sht15.c
---- linux-3.0.3/drivers/hwmon/sht15.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hwmon/sht15.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hwmon/sht15.c linux-3.0.4/drivers/hwmon/sht15.c
+--- linux-3.0.4/drivers/hwmon/sht15.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hwmon/sht15.c	2011-08-23 21:47:55.000000000 -0400
 @@ -166,7 +166,7 @@ struct sht15_data {
  	int				supply_uV;
  	bool				supply_uV_valid;
@@ -25446,9 +25430,9 @@ diff -urNp linux-3.0.3/drivers/hwmon/sht15.c linux-3.0.3/drivers/hwmon/sht15.c
  			return;
  	}
  
-diff -urNp linux-3.0.3/drivers/hwmon/w83791d.c linux-3.0.3/drivers/hwmon/w83791d.c
---- linux-3.0.3/drivers/hwmon/w83791d.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hwmon/w83791d.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hwmon/w83791d.c linux-3.0.4/drivers/hwmon/w83791d.c
+--- linux-3.0.4/drivers/hwmon/w83791d.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hwmon/w83791d.c	2011-08-23 21:47:55.000000000 -0400
 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
  			  struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
@@ -25460,9 +25444,9 @@ diff -urNp linux-3.0.3/drivers/hwmon/w83791d.c linux-3.0.3/drivers/hwmon/w83791d
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@
  extern struct i2c_adapter amd756_smbus;
  
@@ -25472,9 +25456,9 @@ diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.3/drivers
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-23 21:47:55.000000000 -0400
 @@ -41,7 +41,7 @@
  extern struct i2c_adapter *nforce2_smbus;
  
@@ -25484,9 +25468,9 @@ diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.3/driver
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-3.0.3/drivers/i2c/i2c-mux.c linux-3.0.3/drivers/i2c/i2c-mux.c
---- linux-3.0.3/drivers/i2c/i2c-mux.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/i2c/i2c-mux.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/i2c/i2c-mux.c linux-3.0.4/drivers/i2c/i2c-mux.c
+--- linux-3.0.4/drivers/i2c/i2c-mux.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/i2c/i2c-mux.c	2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,7 @@
  /* multiplexer per channel data */
  struct i2c_mux_priv {
@@ -25496,9 +25480,9 @@ diff -urNp linux-3.0.3/drivers/i2c/i2c-mux.c linux-3.0.3/drivers/i2c/i2c-mux.c
  
  	struct i2c_adapter *parent;
  	void *mux_dev;	/* the mux chip/device */
-diff -urNp linux-3.0.3/drivers/ide/ide-cd.c linux-3.0.3/drivers/ide/ide-cd.c
---- linux-3.0.3/drivers/ide/ide-cd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ide/ide-cd.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ide/ide-cd.c linux-3.0.4/drivers/ide/ide-cd.c
+--- linux-3.0.4/drivers/ide/ide-cd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ide/ide-cd.c	2011-08-23 21:47:55.000000000 -0400
 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
@@ -25508,9 +25492,9 @@ diff -urNp linux-3.0.3/drivers/ide/ide-cd.c linux-3.0.3/drivers/ide/ide-cd.c
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-3.0.3/drivers/ide/ide-floppy.c linux-3.0.3/drivers/ide/ide-floppy.c
---- linux-3.0.3/drivers/ide/ide-floppy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ide/ide-floppy.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ide/ide-floppy.c linux-3.0.4/drivers/ide/ide-floppy.c
+--- linux-3.0.4/drivers/ide/ide-floppy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ide/ide-floppy.c	2011-08-23 21:48:14.000000000 -0400
 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
  	u8 pc_buf[256], header_len, desc_cnt;
  	int i, rc = 1, blocks, length;
@@ -25520,9 +25504,9 @@ diff -urNp linux-3.0.3/drivers/ide/ide-floppy.c linux-3.0.3/drivers/ide/ide-flop
  	ide_debug_log(IDE_DBG_FUNC, "enter");
  
  	drive->bios_cyl = 0;
-diff -urNp linux-3.0.3/drivers/ide/setup-pci.c linux-3.0.3/drivers/ide/setup-pci.c
---- linux-3.0.3/drivers/ide/setup-pci.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ide/setup-pci.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ide/setup-pci.c linux-3.0.4/drivers/ide/setup-pci.c
+--- linux-3.0.4/drivers/ide/setup-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ide/setup-pci.c	2011-08-23 21:48:14.000000000 -0400
 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
  	int ret, i, n_ports = dev2 ? 4 : 2;
  	struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -25532,9 +25516,9 @@ diff -urNp linux-3.0.3/drivers/ide/setup-pci.c linux-3.0.3/drivers/ide/setup-pci
  	for (i = 0; i < n_ports / 2; i++) {
  		ret = ide_setup_pci_controller(pdev[i], d, !i);
  		if (ret < 0)
-diff -urNp linux-3.0.3/drivers/infiniband/core/cm.c linux-3.0.3/drivers/infiniband/core/cm.c
---- linux-3.0.3/drivers/infiniband/core/cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/core/cm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/core/cm.c linux-3.0.4/drivers/infiniband/core/cm.c
+--- linux-3.0.4/drivers/infiniband/core/cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/core/cm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -25674,9 +25658,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/core/cm.c linux-3.0.3/drivers/infiniba
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-3.0.3/drivers/infiniband/core/fmr_pool.c linux-3.0.3/drivers/infiniband/core/fmr_pool.c
---- linux-3.0.3/drivers/infiniband/core/fmr_pool.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/core/fmr_pool.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/core/fmr_pool.c linux-3.0.4/drivers/infiniband/core/fmr_pool.c
+--- linux-3.0.4/drivers/infiniband/core/fmr_pool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/core/fmr_pool.c	2011-08-23 21:47:55.000000000 -0400
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
  	struct task_struct       *thread;
@@ -25744,9 +25728,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/core/fmr_pool.c linux-3.0.3/drivers/in
  				wake_up_process(pool->thread);
  			}
  		}
-diff -urNp linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c
---- linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c	2011-08-23 21:47:55.000000000 -0400
 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
  	int err;
  	struct fw_ri_tpte tpt;
@@ -25765,9 +25749,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.3/drivers/inf
  	}
  	PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
  	     __func__, stag_state, type, pdid, stag_idx);
-diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
  	struct infinipath_counters counters;
  	struct ipath_devdata *dd;
@@ -25777,9 +25761,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.3/driver
  	dd = file->f_path.dentry->d_inode->i_private;
  	dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
  		struct ib_atomic_eth *ateth;
  		struct ipath_ack_entry *e;
@@ -25803,9 +25787,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.3/driver
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      be64_to_cpu(ateth->compare_data),
  				      sdata);
-diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
  	unsigned long flags;
  	struct ib_wc wc;
@@ -25829,9 +25813,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.3/drive
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      sdata, wqe->wr.wr.atomic.swap);
  		goto send_comp;
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.c linux-3.0.3/drivers/infiniband/hw/nes/nes.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.c linux-3.0.4/drivers/infiniband/hw/nes/nes.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes.c	2011-08-23 21:47:55.000000000 -0400
 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -25850,9 +25834,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.c linux-3.0.3/drivers/infin
  
  	/* Free the control structures */
  
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -26049,9 +26033,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.3/drivers/in
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.h linux-3.0.3/drivers/infiniband/hw/nes/nes.h
---- linux-3.0.3/drivers/infiniband/hw/nes/nes.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.h linux-3.0.4/drivers/infiniband/hw/nes/nes.h
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes.h	2011-08-23 21:47:55.000000000 -0400
 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -26103,9 +26087,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.h linux-3.0.3/drivers/infin
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
@@ -26156,9 +26140,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.3/drivers/i
  	target_stat_values[++index] = nesadapter->free_4kpbl;
  	target_stat_values[++index] = nesadapter->free_256pbl;
  	target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -26190,9 +26174,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.3/drivers
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff -urNp linux-3.0.3/drivers/infiniband/hw/qib/qib.h linux-3.0.3/drivers/infiniband/hw/qib/qib.h
---- linux-3.0.3/drivers/infiniband/hw/qib/qib.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/qib/qib.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/qib/qib.h linux-3.0.4/drivers/infiniband/hw/qib/qib.h
+--- linux-3.0.4/drivers/infiniband/hw/qib/qib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/qib/qib.h	2011-08-23 21:47:55.000000000 -0400
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -26201,9 +26185,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/qib/qib.h linux-3.0.3/drivers/infin
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-3.0.3/drivers/input/gameport/gameport.c linux-3.0.3/drivers/input/gameport/gameport.c
---- linux-3.0.3/drivers/input/gameport/gameport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/gameport/gameport.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/gameport/gameport.c linux-3.0.4/drivers/input/gameport/gameport.c
+--- linux-3.0.4/drivers/input/gameport/gameport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/gameport/gameport.c	2011-08-23 21:47:55.000000000 -0400
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -26221,9 +26205,9 @@ diff -urNp linux-3.0.3/drivers/input/gameport/gameport.c linux-3.0.3/drivers/inp
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff -urNp linux-3.0.3/drivers/input/input.c linux-3.0.3/drivers/input/input.c
---- linux-3.0.3/drivers/input/input.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/input.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/input.c linux-3.0.4/drivers/input/input.c
+--- linux-3.0.4/drivers/input/input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/input.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
@@ -26242,9 +26226,9 @@ diff -urNp linux-3.0.3/drivers/input/input.c linux-3.0.3/drivers/input/input.c
  
  	error = device_add(&dev->dev);
  	if (error)
-diff -urNp linux-3.0.3/drivers/input/joystick/sidewinder.c linux-3.0.3/drivers/input/joystick/sidewinder.c
---- linux-3.0.3/drivers/input/joystick/sidewinder.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/joystick/sidewinder.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/joystick/sidewinder.c linux-3.0.4/drivers/input/joystick/sidewinder.c
+--- linux-3.0.4/drivers/input/joystick/sidewinder.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/joystick/sidewinder.c	2011-08-23 21:48:14.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -26262,9 +26246,9 @@ diff -urNp linux-3.0.3/drivers/input/joystick/sidewinder.c linux-3.0.3/drivers/i
  	i = sw_read_packet(sw->gameport, buf, sw->length, 0);
  
  	if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) {		/* Broken packet, try to fix */
-diff -urNp linux-3.0.3/drivers/input/joystick/xpad.c linux-3.0.3/drivers/input/joystick/xpad.c
---- linux-3.0.3/drivers/input/joystick/xpad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/joystick/xpad.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/joystick/xpad.c
+--- linux-3.0.4/drivers/input/joystick/xpad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/joystick/xpad.c	2011-08-23 21:47:55.000000000 -0400
 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
@@ -26283,9 +26267,9 @@ diff -urNp linux-3.0.3/drivers/input/joystick/xpad.c linux-3.0.3/drivers/input/j
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff -urNp linux-3.0.3/drivers/input/mousedev.c linux-3.0.3/drivers/input/mousedev.c
---- linux-3.0.3/drivers/input/mousedev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/mousedev.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/mousedev.c linux-3.0.4/drivers/input/mousedev.c
+--- linux-3.0.4/drivers/input/mousedev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/mousedev.c	2011-08-23 21:47:55.000000000 -0400
 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
  
  	spin_unlock_irq(&client->packet_lock);
@@ -26295,9 +26279,9 @@ diff -urNp linux-3.0.3/drivers/input/mousedev.c linux-3.0.3/drivers/input/moused
  		return -EFAULT;
  
  	return count;
-diff -urNp linux-3.0.3/drivers/input/serio/serio.c linux-3.0.3/drivers/input/serio/serio.c
---- linux-3.0.3/drivers/input/serio/serio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/serio/serio.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/serio/serio.c linux-3.0.4/drivers/input/serio/serio.c
+--- linux-3.0.4/drivers/input/serio/serio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/serio/serio.c	2011-08-23 21:47:55.000000000 -0400
 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -26316,9 +26300,9 @@ diff -urNp linux-3.0.3/drivers/input/serio/serio.c linux-3.0.3/drivers/input/ser
  	serio->dev.bus = &serio_bus;
  	serio->dev.release = serio_release_port;
  	serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-3.0.3/drivers/isdn/capi/capi.c linux-3.0.3/drivers/isdn/capi/capi.c
---- linux-3.0.3/drivers/isdn/capi/capi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/capi/capi.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/capi/capi.c linux-3.0.4/drivers/isdn/capi/capi.c
+--- linux-3.0.4/drivers/isdn/capi/capi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/capi/capi.c	2011-08-23 21:47:55.000000000 -0400
 @@ -83,8 +83,8 @@ struct capiminor {
  
  	struct capi20_appl	*ap;
@@ -26356,9 +26340,9 @@ diff -urNp linux-3.0.3/drivers/isdn/capi/capi.c linux-3.0.3/drivers/isdn/capi/ca
  		capimsg_setu32(skb->data, 8, mp->ncci);	/* NCCI */
  		capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
  		capimsg_setu16(skb->data, 16, len);	/* Data length */
-diff -urNp linux-3.0.3/drivers/isdn/gigaset/common.c linux-3.0.3/drivers/isdn/gigaset/common.c
---- linux-3.0.3/drivers/isdn/gigaset/common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/gigaset/common.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/gigaset/common.c linux-3.0.4/drivers/isdn/gigaset/common.c
+--- linux-3.0.4/drivers/isdn/gigaset/common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/gigaset/common.c	2011-08-23 21:47:55.000000000 -0400
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
@@ -26368,9 +26352,9 @@ diff -urNp linux-3.0.3/drivers/isdn/gigaset/common.c linux-3.0.3/drivers/isdn/gi
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-3.0.3/drivers/isdn/gigaset/gigaset.h linux-3.0.3/drivers/isdn/gigaset/gigaset.h
---- linux-3.0.3/drivers/isdn/gigaset/gigaset.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/gigaset/gigaset.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/gigaset/gigaset.h linux-3.0.4/drivers/isdn/gigaset/gigaset.h
+--- linux-3.0.4/drivers/isdn/gigaset/gigaset.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/gigaset/gigaset.h	2011-08-23 21:47:55.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -26388,9 +26372,9 @@ diff -urNp linux-3.0.3/drivers/isdn/gigaset/gigaset.h linux-3.0.3/drivers/isdn/g
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-3.0.3/drivers/isdn/gigaset/interface.c linux-3.0.3/drivers/isdn/gigaset/interface.c
---- linux-3.0.3/drivers/isdn/gigaset/interface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/gigaset/interface.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/gigaset/interface.c linux-3.0.4/drivers/isdn/gigaset/interface.c
+--- linux-3.0.4/drivers/isdn/gigaset/interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/gigaset/interface.c	2011-08-23 21:47:55.000000000 -0400
 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
  	}
  	tty->driver_data = cs;
@@ -26478,9 +26462,9 @@ diff -urNp linux-3.0.3/drivers/isdn/gigaset/interface.c linux-3.0.3/drivers/isdn
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-3.0.3/drivers/isdn/hardware/avm/b1.c linux-3.0.3/drivers/isdn/hardware/avm/b1.c
---- linux-3.0.3/drivers/isdn/hardware/avm/b1.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/avm/b1.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/avm/b1.c linux-3.0.4/drivers/isdn/hardware/avm/b1.c
+--- linux-3.0.4/drivers/isdn/hardware/avm/b1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/avm/b1.c	2011-08-23 21:47:55.000000000 -0400
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
@@ -26499,9 +26483,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/avm/b1.c linux-3.0.3/drivers/isdn/h
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c	2011-08-23 21:48:14.000000000 -0400
 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
    byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
      short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
@@ -26510,9 +26494,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.3/driver
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26522,9 +26506,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.3/driver
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26534,9 +26518,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.3/driver
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26546,9 +26530,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.3/drive
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h
---- linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h	2011-08-23 21:47:55.000000000 -0400
 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
  } diva_didd_add_adapter_t;
  typedef struct _diva_didd_remove_adapter {
@@ -26558,9 +26542,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h linux-3.0.3/driver
  typedef struct _diva_didd_read_adapter_array {
   void   * buffer;
   dword length;
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26570,9 +26554,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.3/drivers
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/message.c linux-3.0.3/drivers/isdn/hardware/eicon/message.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/message.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/message.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/message.c linux-3.0.4/drivers/isdn/hardware/eicon/message.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/message.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/message.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
@@ -26609,9 +26593,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/message.c linux-3.0.3/drivers
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26621,9 +26605,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.3/drivers
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
  typedef struct _diva_os_idi_adapter_interface {
  	diva_init_card_proc_t cleanup_adapter_proc;
@@ -26633,9 +26617,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.3/dri
  
  typedef struct _diva_os_xdi_adapter {
  	struct list_head link;
-diff -urNp linux-3.0.3/drivers/isdn/i4l/isdn_common.c linux-3.0.3/drivers/isdn/i4l/isdn_common.c
---- linux-3.0.3/drivers/isdn/i4l/isdn_common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/i4l/isdn_common.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/i4l/isdn_common.c linux-3.0.4/drivers/isdn/i4l/isdn_common.c
+--- linux-3.0.4/drivers/isdn/i4l/isdn_common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/i4l/isdn_common.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, 
  	} iocpar;
  	void __user *argp = (void __user *)arg;
@@ -26645,9 +26629,9 @@ diff -urNp linux-3.0.3/drivers/isdn/i4l/isdn_common.c linux-3.0.3/drivers/isdn/i
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-3.0.3/drivers/isdn/icn/icn.c linux-3.0.3/drivers/isdn/icn/icn.c
---- linux-3.0.3/drivers/isdn/icn/icn.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/icn/icn.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/icn/icn.c linux-3.0.4/drivers/isdn/icn/icn.c
+--- linux-3.0.4/drivers/isdn/icn/icn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/icn/icn.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
@@ -26657,9 +26641,9 @@ diff -urNp linux-3.0.3/drivers/isdn/icn/icn.c linux-3.0.3/drivers/isdn/icn/icn.c
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-3.0.3/drivers/lguest/core.c linux-3.0.3/drivers/lguest/core.c
---- linux-3.0.3/drivers/lguest/core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/lguest/core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/lguest/core.c linux-3.0.4/drivers/lguest/core.c
+--- linux-3.0.4/drivers/lguest/core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/lguest/core.c	2011-08-23 21:47:55.000000000 -0400
 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
  	 * it's worked so far.  The end address needs +1 because __get_vm_area
  	 * allocates an extra guard page, so we need space for that.
@@ -26687,9 +26671,9 @@ diff -urNp linux-3.0.3/drivers/lguest/core.c linux-3.0.3/drivers/lguest/core.c
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-3.0.3/drivers/lguest/x86/core.c linux-3.0.3/drivers/lguest/x86/core.c
---- linux-3.0.3/drivers/lguest/x86/core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/lguest/x86/core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/core.c
+--- linux-3.0.4/drivers/lguest/x86/core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/lguest/x86/core.c	2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ static struct {
  /* Offset from where switcher.S was compiled to where we've copied it */
  static unsigned long switcher_offset(void)
@@ -26731,9 +26715,9 @@ diff -urNp linux-3.0.3/drivers/lguest/x86/core.c linux-3.0.3/drivers/lguest/x86/
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-3.0.3/drivers/lguest/x86/switcher_32.S linux-3.0.3/drivers/lguest/x86/switcher_32.S
---- linux-3.0.3/drivers/lguest/x86/switcher_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/lguest/x86/switcher_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/lguest/x86/switcher_32.S linux-3.0.4/drivers/lguest/x86/switcher_32.S
+--- linux-3.0.4/drivers/lguest/x86/switcher_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/lguest/x86/switcher_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -26792,9 +26776,9 @@ diff -urNp linux-3.0.3/drivers/lguest/x86/switcher_32.S linux-3.0.3/drivers/lgue
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-3.0.3/drivers/md/dm.c linux-3.0.3/drivers/md/dm.c
---- linux-3.0.3/drivers/md/dm.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
+--- linux-3.0.4/drivers/md/dm.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/md/dm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -164,9 +164,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
@@ -26849,9 +26833,9 @@ diff -urNp linux-3.0.3/drivers/md/dm.c linux-3.0.3/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3/drivers/md/dm-ioctl.c
---- linux-3.0.3/drivers/md/dm-ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-ioctl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-ioctl.c linux-3.0.4/drivers/md/dm-ioctl.c
+--- linux-3.0.4/drivers/md/dm-ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-ioctl.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
@@ -26861,9 +26845,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3/drivers/md/dm-ioctl.c
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-3.0.3/drivers/md/dm-raid1.c linux-3.0.3/drivers/md/dm-raid1.c
---- linux-3.0.3/drivers/md/dm-raid1.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-raid1.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-raid1.c linux-3.0.4/drivers/md/dm-raid1.c
+--- linux-3.0.4/drivers/md/dm-raid1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-raid1.c	2011-08-23 21:47:55.000000000 -0400
 @@ -40,7 +40,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -26936,9 +26920,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-raid1.c linux-3.0.3/drivers/md/dm-raid1.c
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-3.0.3/drivers/md/dm-stripe.c linux-3.0.3/drivers/md/dm-stripe.c
---- linux-3.0.3/drivers/md/dm-stripe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-stripe.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-stripe.c linux-3.0.4/drivers/md/dm-stripe.c
+--- linux-3.0.4/drivers/md/dm-stripe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-stripe.c	2011-08-23 21:47:55.000000000 -0400
 @@ -20,7 +20,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
@@ -26977,9 +26961,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-stripe.c linux-3.0.3/drivers/md/dm-stripe.c
  			    DM_IO_ERROR_THRESHOLD)
  				schedule_work(&sc->trigger_event);
  		}
-diff -urNp linux-3.0.3/drivers/md/dm-table.c linux-3.0.3/drivers/md/dm-table.c
---- linux-3.0.3/drivers/md/dm-table.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-table.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-table.c linux-3.0.4/drivers/md/dm-table.c
+--- linux-3.0.4/drivers/md/dm-table.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-table.c	2011-08-23 21:47:55.000000000 -0400
 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
@@ -26989,9 +26973,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-table.c linux-3.0.3/drivers/md/dm-table.c
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-3.0.3/drivers/md/md.c linux-3.0.3/drivers/md/md.c
---- linux-3.0.3/drivers/md/md.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/md.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
+--- linux-3.0.4/drivers/md/md.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/md.c	2011-08-23 21:47:55.000000000 -0400
 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
@@ -27106,9 +27090,9 @@ diff -urNp linux-3.0.3/drivers/md/md.c linux-3.0.3/drivers/md/md.c
  		/* sync IO will cause sync_io to increase before the disk_stats
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
-diff -urNp linux-3.0.3/drivers/md/md.h linux-3.0.3/drivers/md/md.h
---- linux-3.0.3/drivers/md/md.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/md.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
+--- linux-3.0.4/drivers/md/md.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/md.h	2011-08-23 21:47:55.000000000 -0400
 @@ -97,13 +97,13 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
@@ -27134,9 +27118,9 @@ diff -urNp linux-3.0.3/drivers/md/md.h linux-3.0.3/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-3.0.3/drivers/md/raid10.c linux-3.0.3/drivers/md/raid10.c
---- linux-3.0.3/drivers/md/raid10.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/raid10.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
+--- linux-3.0.4/drivers/md/raid10.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/raid10.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi
  	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
  		set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -27196,9 +27180,9 @@ diff -urNp linux-3.0.3/drivers/md/raid10.c linux-3.0.3/drivers/md/raid10.c
  				if (sync_page_io(rdev,
  						 r10_bio->devs[sl].addr +
  						 sect,
-diff -urNp linux-3.0.3/drivers/md/raid1.c linux-3.0.3/drivers/md/raid1.c
---- linux-3.0.3/drivers/md/raid1.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/raid1.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/raid1.c linux-3.0.4/drivers/md/raid1.c
+--- linux-3.0.4/drivers/md/raid1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/raid1.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t *
  				rdev_dec_pending(rdev, mddev);
  				md_error(mddev, rdev);
@@ -27217,9 +27201,9 @@ diff -urNp linux-3.0.3/drivers/md/raid1.c linux-3.0.3/drivers/md/raid1.c
  					printk(KERN_INFO
  					       "md/raid1:%s: read error corrected "
  					       "(%d sectors at %llu on %s)\n",
-diff -urNp linux-3.0.3/drivers/md/raid5.c linux-3.0.3/drivers/md/raid5.c
---- linux-3.0.3/drivers/md/raid5.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/raid5.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
+--- linux-3.0.4/drivers/md/raid5.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/raid5.c	2011-08-23 21:48:14.000000000 -0400
 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
  			bi->bi_next = NULL;
  			if ((rw & WRITE) &&
@@ -27265,9 +27249,9 @@ diff -urNp linux-3.0.3/drivers/md/raid5.c linux-3.0.3/drivers/md/raid5.c
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
-diff -urNp linux-3.0.3/drivers/media/common/saa7146_hlp.c linux-3.0.3/drivers/media/common/saa7146_hlp.c
---- linux-3.0.3/drivers/media/common/saa7146_hlp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/common/saa7146_hlp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/common/saa7146_hlp.c linux-3.0.4/drivers/media/common/saa7146_hlp.c
+--- linux-3.0.4/drivers/media/common/saa7146_hlp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/common/saa7146_hlp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
  	int x[32], y[32], w[32], h[32];
@@ -27277,9 +27261,9 @@ diff -urNp linux-3.0.3/drivers/media/common/saa7146_hlp.c linux-3.0.3/drivers/me
  	/* clear out memory */
  	memset(&line_list[0],  0x00, sizeof(u32)*32);
  	memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-08-23 21:48:14.000000000 -0400
 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
  	u8 buf[HOST_LINK_BUF_SIZE];
  	int i;
@@ -27298,9 +27282,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.3/d
  	dprintk("%s\n", __func__);
  
  	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-24 18:24:40.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-24 18:24:40.000000000 -0400
 @@ -68,12 +68,12 @@ struct dvb_demux_feed {
  	union {
  		struct dmx_ts_feed ts;
@@ -27316,9 +27300,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.3/driver
  
  	struct dvb_demux *demux;
  	void *priv;
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-24 18:24:19.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-24 18:24:19.000000000 -0400
 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
  			const struct dvb_device *template, void *priv, int type)
  {
@@ -27328,9 +27312,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.3/drivers/m
  	struct device *clsdev;
  	int minor;
  	int id;
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-24 18:26:33.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-24 18:26:33.000000000 -0400
 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
  struct dib0700_adapter_state {
  	int (*set_param_save) (struct dvb_frontend *,
@@ -27340,9 +27324,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.3/drivers/med
  
  static int dib7070_set_param_override(struct dvb_frontend *fe,
  				      struct dvb_frontend_parameters *fep)
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-08-23 21:48:14.000000000 -0400
 @@ -434,6 +434,8 @@ int dib0700_download_firmware(struct usb
  	if (!buf)
  		return -ENOMEM;
@@ -27352,9 +27336,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.3/driv
  	while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
  		deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",
  				hx.addr, hx.len, hx.chk);
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h
---- linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h	2011-08-24 18:27:27.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h	2011-08-24 18:27:27.000000000 -0400
 @@ -97,7 +97,7 @@
  #define DIBUSB_IOCTL_CMD_DISABLE_STREAM	0x02
  
@@ -27364,9 +27348,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.3/drivers/me
  	int mt2060_present;
  	u8 tuner_addr;
  };
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c	2011-08-24 18:27:45.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c	2011-08-24 18:27:45.000000000 -0400
 @@ -95,7 +95,7 @@ struct su3000_state {
  
  struct s6x0_state {
@@ -27376,9 +27360,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.3/drivers/me
  
  /* debug */
  static int dvb_usb_dw2102_debug;
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c	2011-08-23 21:48:14.000000000 -0400
 @@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
  	usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
  			0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
@@ -27396,9 +27380,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.3/drivers/m
  	data[0] = 0x0a;
  	len_in = 1;
  	info("FRM Firmware Cold Reset");
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000.h linux-3.0.3/drivers/media/dvb/frontends/dib3000.h
---- linux-3.0.3/drivers/media/dvb/frontends/dib3000.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/dib3000.h	2011-08-24 18:28:18.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000.h linux-3.0.4/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.0.4/drivers/media/dvb/frontends/dib3000.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/dib3000.h	2011-08-24 18:28:18.000000000 -0400
 @@ -40,10 +40,11 @@ struct dib_fe_xfer_ops
  	int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
  	int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
@@ -27412,9 +27396,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000.h linux-3.0.3/drivers
  #else
  static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
  					     struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c
---- linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c	2011-08-24 18:28:42.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c
+--- linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c	2011-08-24 18:28:42.000000000 -0400
 @@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str
  static struct dvb_frontend_ops dib3000mb_ops;
  
@@ -27424,9 +27408,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.3/drive
  {
  	struct dib3000_state* state = NULL;
  
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c
---- linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
  	int ret = -1;
  	int sync;
@@ -27436,9 +27420,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c linux-3.0.3/drivers
  	dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
  	fcp = 3000;
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/or51211.c linux-3.0.3/drivers/media/dvb/frontends/or51211.c
---- linux-3.0.3/drivers/media/dvb/frontends/or51211.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/or51211.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/or51211.c linux-3.0.4/drivers/media/dvb/frontends/or51211.c
+--- linux-3.0.4/drivers/media/dvb/frontends/or51211.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/or51211.c	2011-08-23 21:48:14.000000000 -0400
 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
  	u8 tudata[585];
  	int i;
@@ -27448,9 +27432,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/or51211.c linux-3.0.3/drivers
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
-diff -urNp linux-3.0.3/drivers/media/video/cx18/cx18-driver.c linux-3.0.3/drivers/media/video/cx18/cx18-driver.c
---- linux-3.0.3/drivers/media/video/cx18/cx18-driver.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/cx18/cx18-driver.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/cx18/cx18-driver.c linux-3.0.4/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.0.4/drivers/media/video/cx18/cx18-driver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/cx18/cx18-driver.c	2011-08-23 21:48:14.000000000 -0400
 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
  	struct i2c_client c;
  	u8 eedata[256];
@@ -27460,9 +27444,9 @@ diff -urNp linux-3.0.3/drivers/media/video/cx18/cx18-driver.c linux-3.0.3/driver
  	memset(&c, 0, sizeof(c));
  	strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
  	c.adapter = &cx->i2c_adap[0];
-diff -urNp linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c
---- linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c	2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur
  	bool handle = false;
  	struct ir_raw_event ir_core_event[64];
@@ -27472,9 +27456,9 @@ diff -urNp linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c linux-3.0.3/d
  	do {
  		num = 0;
  		v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-08-23 21:48:14.000000000 -0400
 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
  	u8 *eeprom;
  	struct tveeprom tvdata;
@@ -27484,9 +27468,9 @@ diff -urNp linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.3/
  	memset(&tvdata,0,sizeof(tvdata));
  
  	eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c
---- linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
  	unsigned char localPAT[256];
  	unsigned char localPMT[256];
@@ -27496,9 +27480,9 @@ diff -urNp linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c linux-3.0.3/drive
  	/* Set video format - must be done first as it resets other settings */
  	set_reg8(client, 0x41, h->video_format);
  
-diff -urNp linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c	2011-08-23 21:48:14.000000000 -0400
 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
  	u8 tmp[512];
  	dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -27517,9 +27501,9 @@ diff -urNp linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.3/dri
  	while (loop) {
  
  		struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-3.0.3/drivers/media/video/timblogiw.c linux-3.0.3/drivers/media/video/timblogiw.c
---- linux-3.0.3/drivers/media/video/timblogiw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/timblogiw.c	2011-08-24 18:29:20.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/timblogiw.c linux-3.0.4/drivers/media/video/timblogiw.c
+--- linux-3.0.4/drivers/media/video/timblogiw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/timblogiw.c	2011-08-24 18:29:20.000000000 -0400
 @@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f
  
  /* Platform device functions */
@@ -27529,9 +27513,9 @@ diff -urNp linux-3.0.3/drivers/media/video/timblogiw.c linux-3.0.3/drivers/media
  	.vidioc_querycap		= timblogiw_querycap,
  	.vidioc_enum_fmt_vid_cap	= timblogiw_enum_fmt,
  	.vidioc_g_fmt_vid_cap		= timblogiw_g_fmt,
-diff -urNp linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c
---- linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c	2011-08-23 21:48:14.000000000 -0400
 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
  	unsigned char rv, gv, bv;
  	static unsigned char *Y, *U, *V;
@@ -27541,9 +27525,9 @@ diff -urNp linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c linux-3.0.
  	frame = usbvision->cur_frame;
  	image_size = frame->frmwidth * frame->frmheight;
  	if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-3.0.3/drivers/media/video/videobuf-dma-sg.c linux-3.0.3/drivers/media/video/videobuf-dma-sg.c
---- linux-3.0.3/drivers/media/video/videobuf-dma-sg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/videobuf-dma-sg.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/videobuf-dma-sg.c linux-3.0.4/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.0.4/drivers/media/video/videobuf-dma-sg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/videobuf-dma-sg.c	2011-08-23 21:48:14.000000000 -0400
 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
  {
  	struct videobuf_queue q;
@@ -27553,9 +27537,9 @@ diff -urNp linux-3.0.3/drivers/media/video/videobuf-dma-sg.c linux-3.0.3/drivers
  	/* Required to make generic handler to call __videobuf_alloc */
  	q.int_ops = &sg_ops;
  
-diff -urNp linux-3.0.3/drivers/message/fusion/mptbase.c linux-3.0.3/drivers/message/fusion/mptbase.c
---- linux-3.0.3/drivers/message/fusion/mptbase.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/fusion/mptbase.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/fusion/mptbase.c linux-3.0.4/drivers/message/fusion/mptbase.c
+--- linux-3.0.4/drivers/message/fusion/mptbase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/fusion/mptbase.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct 
  	seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
  	seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -27570,9 +27554,9 @@ diff -urNp linux-3.0.3/drivers/message/fusion/mptbase.c linux-3.0.3/drivers/mess
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-3.0.3/drivers/message/fusion/mptsas.c linux-3.0.3/drivers/message/fusion/mptsas.c
---- linux-3.0.3/drivers/message/fusion/mptsas.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/fusion/mptsas.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/fusion/mptsas.c linux-3.0.4/drivers/message/fusion/mptsas.c
+--- linux-3.0.4/drivers/message/fusion/mptsas.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/fusion/mptsas.c	2011-08-23 21:47:55.000000000 -0400
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
@@ -27621,9 +27605,9 @@ diff -urNp linux-3.0.3/drivers/message/fusion/mptsas.c linux-3.0.3/drivers/messa
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-3.0.3/drivers/message/fusion/mptscsih.c linux-3.0.3/drivers/message/fusion/mptscsih.c
---- linux-3.0.3/drivers/message/fusion/mptscsih.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/fusion/mptscsih.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/fusion/mptscsih.c linux-3.0.4/drivers/message/fusion/mptscsih.c
+--- linux-3.0.4/drivers/message/fusion/mptscsih.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/fusion/mptscsih.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -27649,9 +27633,9 @@ diff -urNp linux-3.0.3/drivers/message/fusion/mptscsih.c linux-3.0.3/drivers/mes
  
  	return h->info_kbuf;
  }
-diff -urNp linux-3.0.3/drivers/message/i2o/i2o_config.c linux-3.0.3/drivers/message/i2o/i2o_config.c
---- linux-3.0.3/drivers/message/i2o/i2o_config.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/i2o/i2o_config.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/i2o/i2o_config.c linux-3.0.4/drivers/message/i2o/i2o_config.c
+--- linux-3.0.4/drivers/message/i2o/i2o_config.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/i2o/i2o_config.c	2011-08-23 21:48:14.000000000 -0400
 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
  	struct i2o_message *msg;
  	unsigned int iop;
@@ -27661,9 +27645,9 @@ diff -urNp linux-3.0.3/drivers/message/i2o/i2o_config.c linux-3.0.3/drivers/mess
  	if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
  		return -EFAULT;
  
-diff -urNp linux-3.0.3/drivers/message/i2o/i2o_proc.c linux-3.0.3/drivers/message/i2o/i2o_proc.c
---- linux-3.0.3/drivers/message/i2o/i2o_proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/i2o/i2o_proc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/i2o/i2o_proc.c linux-3.0.4/drivers/message/i2o/i2o_proc.c
+--- linux-3.0.4/drivers/message/i2o/i2o_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/i2o/i2o_proc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -27750,9 +27734,9 @@ diff -urNp linux-3.0.3/drivers/message/i2o/i2o_proc.c linux-3.0.3/drivers/messag
  
  	return 0;
  }
-diff -urNp linux-3.0.3/drivers/message/i2o/iop.c linux-3.0.3/drivers/message/i2o/iop.c
---- linux-3.0.3/drivers/message/i2o/iop.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/i2o/iop.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/i2o/iop.c linux-3.0.4/drivers/message/i2o/iop.c
+--- linux-3.0.4/drivers/message/i2o/iop.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/i2o/iop.c	2011-08-23 21:47:55.000000000 -0400
 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
  	spin_lock_irqsave(&c->context_list_lock, flags);
@@ -27776,9 +27760,9 @@ diff -urNp linux-3.0.3/drivers/message/i2o/iop.c linux-3.0.3/drivers/message/i2o
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-3.0.3/drivers/mfd/abx500-core.c linux-3.0.3/drivers/mfd/abx500-core.c
---- linux-3.0.3/drivers/mfd/abx500-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mfd/abx500-core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mfd/abx500-core.c linux-3.0.4/drivers/mfd/abx500-core.c
+--- linux-3.0.4/drivers/mfd/abx500-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mfd/abx500-core.c	2011-08-23 21:47:55.000000000 -0400
 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
  
  struct abx500_device_entry {
@@ -27788,9 +27772,9 @@ diff -urNp linux-3.0.3/drivers/mfd/abx500-core.c linux-3.0.3/drivers/mfd/abx500-
  	struct device *dev;
  };
  
-diff -urNp linux-3.0.3/drivers/mfd/janz-cmodio.c linux-3.0.3/drivers/mfd/janz-cmodio.c
---- linux-3.0.3/drivers/mfd/janz-cmodio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mfd/janz-cmodio.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mfd/janz-cmodio.c linux-3.0.4/drivers/mfd/janz-cmodio.c
+--- linux-3.0.4/drivers/mfd/janz-cmodio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mfd/janz-cmodio.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -27799,9 +27783,9 @@ diff -urNp linux-3.0.3/drivers/mfd/janz-cmodio.c linux-3.0.3/drivers/mfd/janz-cm
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-3.0.3/drivers/mfd/wm8350-i2c.c linux-3.0.3/drivers/mfd/wm8350-i2c.c
---- linux-3.0.3/drivers/mfd/wm8350-i2c.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mfd/wm8350-i2c.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mfd/wm8350-i2c.c linux-3.0.4/drivers/mfd/wm8350-i2c.c
+--- linux-3.0.4/drivers/mfd/wm8350-i2c.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mfd/wm8350-i2c.c	2011-08-23 21:48:14.000000000 -0400
 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
  	u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
  	int ret;
@@ -27811,9 +27795,9 @@ diff -urNp linux-3.0.3/drivers/mfd/wm8350-i2c.c linux-3.0.3/drivers/mfd/wm8350-i
  	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
  		return -EINVAL;
  
-diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c	2011-08-23 21:47:55.000000000 -0400
 @@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in
  	 * the lid is closed. This leads to interrupts as soon as a little move
  	 * is done.
@@ -27850,9 +27834,9 @@ diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.3/drivers/mi
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h	2011-08-23 21:47:55.000000000 -0400
 @@ -265,7 +265,7 @@ struct lis3lv02d {
  	struct input_polled_dev	*idev;     /* input device */
  	struct platform_device	*pdev;     /* platform device */
@@ -27862,9 +27846,9 @@ diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.3/drivers/mi
  	union axis_conversion	ac;        /* hw -> logical axis */
  	int			mapped_btns[3];
  
-diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c
---- linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c	2011-08-23 21:47:55.000000000 -0400
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
  	unsigned long nsec;
  
@@ -27876,9 +27860,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c linux-3.0.3/drivers/mis
  	if (mcs_op_statistics[op].max < nsec)
  		mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c
---- linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -27902,9 +27886,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.3/drivers/misc
  		max = mcs_op_statistics[op].max;
  		seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
  			   count ? total / count : 0, max);
-diff -urNp linux-3.0.3/drivers/misc/sgi-gru/grutables.h linux-3.0.3/drivers/misc/sgi-gru/grutables.h
---- linux-3.0.3/drivers/misc/sgi-gru/grutables.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-gru/grutables.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-gru/grutables.h linux-3.0.4/drivers/misc/sgi-gru/grutables.h
+--- linux-3.0.4/drivers/misc/sgi-gru/grutables.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-gru/grutables.h	2011-08-23 21:47:55.000000000 -0400
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -28084,9 +28068,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-gru/grutables.h linux-3.0.3/drivers/misc
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-3.0.3/drivers/misc/sgi-xp/xp.h linux-3.0.3/drivers/misc/sgi-xp/xp.h
---- linux-3.0.3/drivers/misc/sgi-xp/xp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-xp/xp.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-xp/xp.h linux-3.0.4/drivers/misc/sgi-xp/xp.h
+--- linux-3.0.4/drivers/misc/sgi-xp/xp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-xp/xp.h	2011-08-23 21:47:55.000000000 -0400
 @@ -289,7 +289,7 @@ struct xpc_interface {
  					xpc_notify_func, void *);
  	void (*received) (short, int, void *);
@@ -28096,9 +28080,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-xp/xp.h linux-3.0.3/drivers/misc/sgi-xp/
  
  extern struct xpc_interface xpc_interface;
  
-diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c	2011-08-23 21:48:14.000000000 -0400
 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
  	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  	unsigned long timeo = jiffies + HZ;
@@ -28126,9 +28110,9 @@ diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.3/drivers/m
  	adr += chip->start;
  
   retry:
-diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c	2011-08-23 21:48:14.000000000 -0400
 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
  	unsigned long cmd_addr;
  	struct cfi_private *cfi = map->fldrv_priv;
@@ -28174,9 +28158,9 @@ diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.3/drivers/m
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-diff -urNp linux-3.0.3/drivers/mtd/devices/doc2000.c linux-3.0.3/drivers/mtd/devices/doc2000.c
---- linux-3.0.3/drivers/mtd/devices/doc2000.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/devices/doc2000.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/devices/doc2000.c linux-3.0.4/drivers/mtd/devices/doc2000.c
+--- linux-3.0.4/drivers/mtd/devices/doc2000.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/devices/doc2000.c	2011-08-23 21:47:55.000000000 -0400
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
@@ -28186,9 +28170,9 @@ diff -urNp linux-3.0.3/drivers/mtd/devices/doc2000.c linux-3.0.3/drivers/mtd/dev
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-3.0.3/drivers/mtd/devices/doc2001.c linux-3.0.3/drivers/mtd/devices/doc2001.c
---- linux-3.0.3/drivers/mtd/devices/doc2001.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/devices/doc2001.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/devices/doc2001.c linux-3.0.4/drivers/mtd/devices/doc2001.c
+--- linux-3.0.4/drivers/mtd/devices/doc2001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/devices/doc2001.c	2011-08-23 21:47:55.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -28198,9 +28182,9 @@ diff -urNp linux-3.0.3/drivers/mtd/devices/doc2001.c linux-3.0.3/drivers/mtd/dev
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-3.0.3/drivers/mtd/ftl.c linux-3.0.3/drivers/mtd/ftl.c
---- linux-3.0.3/drivers/mtd/ftl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/ftl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/ftl.c linux-3.0.4/drivers/mtd/ftl.c
+--- linux-3.0.4/drivers/mtd/ftl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/ftl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -28210,9 +28194,9 @@ diff -urNp linux-3.0.3/drivers/mtd/ftl.c linux-3.0.3/drivers/mtd/ftl.c
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-3.0.3/drivers/mtd/inftlcore.c linux-3.0.3/drivers/mtd/inftlcore.c
---- linux-3.0.3/drivers/mtd/inftlcore.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/inftlcore.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/inftlcore.c linux-3.0.4/drivers/mtd/inftlcore.c
+--- linux-3.0.4/drivers/mtd/inftlcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/inftlcore.c	2011-08-23 21:48:14.000000000 -0400
 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
  	struct inftl_oob oob;
  	size_t retlen;
@@ -28222,9 +28206,9 @@ diff -urNp linux-3.0.3/drivers/mtd/inftlcore.c linux-3.0.3/drivers/mtd/inftlcore
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
  		"pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff -urNp linux-3.0.3/drivers/mtd/inftlmount.c linux-3.0.3/drivers/mtd/inftlmount.c
---- linux-3.0.3/drivers/mtd/inftlmount.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/inftlmount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/inftlmount.c linux-3.0.4/drivers/mtd/inftlmount.c
+--- linux-3.0.4/drivers/mtd/inftlmount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/inftlmount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
  	struct INFTLPartition *ip;
  	size_t retlen;
@@ -28234,9 +28218,9 @@ diff -urNp linux-3.0.3/drivers/mtd/inftlmount.c linux-3.0.3/drivers/mtd/inftlmou
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c
---- linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
  	map_word pfow_val[4];
@@ -28246,9 +28230,9 @@ diff -urNp linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.3/drivers/mtd/l
  	/* Check identification string */
  	pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
  	pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
-diff -urNp linux-3.0.3/drivers/mtd/mtdchar.c linux-3.0.3/drivers/mtd/mtdchar.c
---- linux-3.0.3/drivers/mtd/mtdchar.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/mtdchar.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/mtdchar.c linux-3.0.4/drivers/mtd/mtdchar.c
+--- linux-3.0.4/drivers/mtd/mtdchar.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/mtdchar.c	2011-08-23 21:48:14.000000000 -0400
 @@ -553,6 +553,8 @@ static int mtd_ioctl(struct file *file, 
  	u_long size;
  	struct mtd_info_user info;
@@ -28258,9 +28242,9 @@ diff -urNp linux-3.0.3/drivers/mtd/mtdchar.c linux-3.0.3/drivers/mtd/mtdchar.c
  	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
  	size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-3.0.3/drivers/mtd/nand/denali.c linux-3.0.3/drivers/mtd/nand/denali.c
---- linux-3.0.3/drivers/mtd/nand/denali.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/nand/denali.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/nand/denali.c linux-3.0.4/drivers/mtd/nand/denali.c
+--- linux-3.0.4/drivers/mtd/nand/denali.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/nand/denali.c	2011-08-23 21:47:55.000000000 -0400
 @@ -26,6 +26,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -28269,9 +28253,9 @@ diff -urNp linux-3.0.3/drivers/mtd/nand/denali.c linux-3.0.3/drivers/mtd/nand/de
  
  #include "denali.h"
  
-diff -urNp linux-3.0.3/drivers/mtd/nftlcore.c linux-3.0.3/drivers/mtd/nftlcore.c
---- linux-3.0.3/drivers/mtd/nftlcore.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/nftlcore.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/nftlcore.c linux-3.0.4/drivers/mtd/nftlcore.c
+--- linux-3.0.4/drivers/mtd/nftlcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/nftlcore.c	2011-08-23 21:48:14.000000000 -0400
 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
  	int inplace = 1;
  	size_t retlen;
@@ -28281,9 +28265,9 @@ diff -urNp linux-3.0.3/drivers/mtd/nftlcore.c linux-3.0.3/drivers/mtd/nftlcore.c
  	memset(BlockMap, 0xff, sizeof(BlockMap));
  	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-3.0.3/drivers/mtd/nftlmount.c linux-3.0.3/drivers/mtd/nftlmount.c
---- linux-3.0.3/drivers/mtd/nftlmount.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/nftlmount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/nftlmount.c linux-3.0.4/drivers/mtd/nftlmount.c
+--- linux-3.0.4/drivers/mtd/nftlmount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/nftlmount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -28301,9 +28285,9 @@ diff -urNp linux-3.0.3/drivers/mtd/nftlmount.c linux-3.0.3/drivers/mtd/nftlmount
          /* Assume logical EraseSize == physical erasesize for starting the scan.
  	   We'll sort it out later if we find a MediaHeader which says otherwise */
  	/* Actually, we won't.  The new DiskOnChip driver has already scanned
-diff -urNp linux-3.0.3/drivers/mtd/ubi/build.c linux-3.0.3/drivers/mtd/ubi/build.c
---- linux-3.0.3/drivers/mtd/ubi/build.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/ubi/build.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build.c
+--- linux-3.0.4/drivers/mtd/ubi/build.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/ubi/build.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
@@ -28343,9 +28327,9 @@ diff -urNp linux-3.0.3/drivers/mtd/ubi/build.c linux-3.0.3/drivers/mtd/ubi/build
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c
---- linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c	2011-08-23 21:47:55.000000000 -0400
 @@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
  static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
  static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
@@ -28390,9 +28374,9 @@ diff -urNp linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c linux-3.0.3/drivers/net/bna/
  	ioc->ioc_hwif = &nw_hwif_ct;
  }
  
-diff -urNp linux-3.0.3/drivers/net/bna/bnad.c linux-3.0.3/drivers/net/bna/bnad.c
---- linux-3.0.3/drivers/net/bna/bnad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bna/bnad.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
+--- linux-3.0.4/drivers/net/bna/bnad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bna/bnad.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
  	struct bna_intr_info *intr_info =
  			&res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
@@ -28454,9 +28438,9 @@ diff -urNp linux-3.0.3/drivers/net/bna/bnad.c linux-3.0.3/drivers/net/bna/bnad.c
  	/* Get BNA's resource requirement for one Rx object */
  	spin_lock_irqsave(&bnad->bna_lock, flags);
  	bna_rx_res_req(rx_config, res_info);
-diff -urNp linux-3.0.3/drivers/net/bnx2.c linux-3.0.3/drivers/net/bnx2.c
---- linux-3.0.3/drivers/net/bnx2.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bnx2.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bnx2.c linux-3.0.4/drivers/net/bnx2.c
+--- linux-3.0.4/drivers/net/bnx2.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bnx2.c	2011-08-23 21:48:14.000000000 -0400
 @@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
  	int rc = 0;
  	u32 magic, csum;
@@ -28466,9 +28450,9 @@ diff -urNp linux-3.0.3/drivers/net/bnx2.c linux-3.0.3/drivers/net/bnx2.c
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
-diff -urNp linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x
  	int i, rc;
  	u32 magic, crc;
@@ -28478,9 +28462,9 @@ diff -urNp linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.3/drivers/net
  	if (BP_NOMCP(bp))
  		return 0;
  
-diff -urNp linux-3.0.3/drivers/net/cxgb3/l2t.h linux-3.0.3/drivers/net/cxgb3/l2t.h
---- linux-3.0.3/drivers/net/cxgb3/l2t.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/cxgb3/l2t.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/cxgb3/l2t.h linux-3.0.4/drivers/net/cxgb3/l2t.h
+--- linux-3.0.4/drivers/net/cxgb3/l2t.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/cxgb3/l2t.h	2011-08-23 21:47:55.000000000 -0400
 @@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
   */
  struct l2t_skb_cb {
@@ -28490,9 +28474,9 @@ diff -urNp linux-3.0.3/drivers/net/cxgb3/l2t.h linux-3.0.3/drivers/net/cxgb3/l2t
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
-diff -urNp linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c
---- linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c	2011-08-23 21:48:14.000000000 -0400
 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct 
  	unsigned int nchan = adap->params.nports;
  	struct msix_entry entries[MAX_INGQ + 1];
@@ -28502,9 +28486,9 @@ diff -urNp linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c linux-3.0.3/drivers/net/cx
  	for (i = 0; i < ARRAY_SIZE(entries); ++i)
  		entries[i].entry = i;
  
-diff -urNp linux-3.0.3/drivers/net/cxgb4/t4_hw.c linux-3.0.3/drivers/net/cxgb4/t4_hw.c
---- linux-3.0.3/drivers/net/cxgb4/t4_hw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/cxgb4/t4_hw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/cxgb4/t4_hw.c linux-3.0.4/drivers/net/cxgb4/t4_hw.c
+--- linux-3.0.4/drivers/net/cxgb4/t4_hw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/cxgb4/t4_hw.c	2011-08-23 21:48:14.000000000 -0400
 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
  	u8 vpd[VPD_LEN], csum;
  	unsigned int vpdr_len, kw_offset, id_len;
@@ -28514,9 +28498,9 @@ diff -urNp linux-3.0.3/drivers/net/cxgb4/t4_hw.c linux-3.0.3/drivers/net/cxgb4/t
  	ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-3.0.3/drivers/net/e1000e/82571.c linux-3.0.3/drivers/net/e1000e/82571.c
---- linux-3.0.3/drivers/net/e1000e/82571.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/e1000e/82571.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/e1000e/82571.c linux-3.0.4/drivers/net/e1000e/82571.c
+--- linux-3.0.4/drivers/net/e1000e/82571.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/e1000e/82571.c	2011-08-23 21:47:55.000000000 -0400
 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -28526,9 +28510,9 @@ diff -urNp linux-3.0.3/drivers/net/e1000e/82571.c linux-3.0.3/drivers/net/e1000e
  	u32 swsm = 0;
  	u32 swsm2 = 0;
  	bool force_clear_smbi = false;
-diff -urNp linux-3.0.3/drivers/net/e1000e/es2lan.c linux-3.0.3/drivers/net/e1000e/es2lan.c
---- linux-3.0.3/drivers/net/e1000e/es2lan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/e1000e/es2lan.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/e1000e/es2lan.c linux-3.0.4/drivers/net/e1000e/es2lan.c
+--- linux-3.0.4/drivers/net/e1000e/es2lan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/e1000e/es2lan.c	2011-08-23 21:47:55.000000000 -0400
 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
@@ -28538,9 +28522,9 @@ diff -urNp linux-3.0.3/drivers/net/e1000e/es2lan.c linux-3.0.3/drivers/net/e1000
  
  	/* Set media type */
  	switch (adapter->pdev->device) {
-diff -urNp linux-3.0.3/drivers/net/e1000e/hw.h linux-3.0.3/drivers/net/e1000e/hw.h
---- linux-3.0.3/drivers/net/e1000e/hw.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/e1000e/hw.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw.h
+--- linux-3.0.4/drivers/net/e1000e/hw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/e1000e/hw.h	2011-08-23 21:47:55.000000000 -0400
 @@ -776,6 +776,7 @@ struct e1000_mac_operations {
  	void (*write_vfta)(struct e1000_hw *, u32, u32);
  	s32  (*read_mac_addr)(struct e1000_hw *);
@@ -28587,9 +28571,9 @@ diff -urNp linux-3.0.3/drivers/net/e1000e/hw.h linux-3.0.3/drivers/net/e1000e/hw
  
  	enum e1000_nvm_type type;
  	enum e1000_nvm_override override;
-diff -urNp linux-3.0.3/drivers/net/hamradio/6pack.c linux-3.0.3/drivers/net/hamradio/6pack.c
---- linux-3.0.3/drivers/net/hamradio/6pack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/hamradio/6pack.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/hamradio/6pack.c linux-3.0.4/drivers/net/hamradio/6pack.c
+--- linux-3.0.4/drivers/net/hamradio/6pack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/hamradio/6pack.c	2011-08-23 21:48:14.000000000 -0400
 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
  	unsigned char buf[512];
  	int count1;
@@ -28599,9 +28583,9 @@ diff -urNp linux-3.0.3/drivers/net/hamradio/6pack.c linux-3.0.3/drivers/net/hamr
  	if (!count)
  		return;
  
-diff -urNp linux-3.0.3/drivers/net/igb/e1000_hw.h linux-3.0.3/drivers/net/igb/e1000_hw.h
---- linux-3.0.3/drivers/net/igb/e1000_hw.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/igb/e1000_hw.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/igb/e1000_hw.h linux-3.0.4/drivers/net/igb/e1000_hw.h
+--- linux-3.0.4/drivers/net/igb/e1000_hw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/igb/e1000_hw.h	2011-08-23 21:47:55.000000000 -0400
 @@ -314,6 +314,7 @@ struct e1000_mac_operations {
  	s32  (*read_mac_addr)(struct e1000_hw *);
  	s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
@@ -28670,9 +28654,9 @@ diff -urNp linux-3.0.3/drivers/net/igb/e1000_hw.h linux-3.0.3/drivers/net/igb/e1
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.3/drivers/net/igbvf/vf.h linux-3.0.3/drivers/net/igbvf/vf.h
---- linux-3.0.3/drivers/net/igbvf/vf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/igbvf/vf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/igbvf/vf.h linux-3.0.4/drivers/net/igbvf/vf.h
+--- linux-3.0.4/drivers/net/igbvf/vf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/igbvf/vf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
  	s32  (*read_mac_addr)(struct e1000_hw *);
  	s32  (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -28702,9 +28686,9 @@ diff -urNp linux-3.0.3/drivers/net/igbvf/vf.h linux-3.0.3/drivers/net/igbvf/vf.h
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_main.c linux-3.0.3/drivers/net/ixgb/ixgb_main.c
---- linux-3.0.3/drivers/net/ixgb/ixgb_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgb/ixgb_main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_main.c linux-3.0.4/drivers/net/ixgb/ixgb_main.c
+--- linux-3.0.4/drivers/net/ixgb/ixgb_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgb/ixgb_main.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
  	u32 rctl;
  	int i;
@@ -28714,9 +28698,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_main.c linux-3.0.3/drivers/net/ixgb
  	/* Check for Promiscuous and All Multicast modes */
  
  	rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_param.c linux-3.0.3/drivers/net/ixgb/ixgb_param.c
---- linux-3.0.3/drivers/net/ixgb/ixgb_param.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgb/ixgb_param.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_param.c linux-3.0.4/drivers/net/ixgb/ixgb_param.c
+--- linux-3.0.4/drivers/net/ixgb/ixgb_param.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgb/ixgb_param.c	2011-08-23 21:48:14.000000000 -0400
 @@ -261,6 +261,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -28727,9 +28711,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_param.c linux-3.0.3/drivers/net/ixg
  	if (bd >= IXGB_MAX_NIC) {
  		pr_notice("Warning: no configuration for board #%i\n", bd);
  		pr_notice("Using defaults for all values\n");
-diff -urNp linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h
---- linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h	2011-08-23 21:47:55.000000000 -0400
 @@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations {
  	s32 (*update_checksum)(struct ixgbe_hw *);
  	u16 (*calc_checksum)(struct ixgbe_hw *);
@@ -28793,9 +28777,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h linux-3.0.3/drivers/net/ix
  	struct ixgbe_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.3/drivers/net/ixgbevf/vf.h linux-3.0.3/drivers/net/ixgbevf/vf.h
---- linux-3.0.3/drivers/net/ixgbevf/vf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgbevf/vf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgbevf/vf.h linux-3.0.4/drivers/net/ixgbevf/vf.h
+--- linux-3.0.4/drivers/net/ixgbevf/vf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgbevf/vf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
  	s32 (*clear_vfta)(struct ixgbe_hw *);
  	s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
@@ -28830,9 +28814,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgbevf/vf.h linux-3.0.3/drivers/net/ixgbevf/
  	struct ixgbe_mbx_stats stats;
  	u32 timeout;
  	u32 udelay;
-diff -urNp linux-3.0.3/drivers/net/ksz884x.c linux-3.0.3/drivers/net/ksz884x.c
---- linux-3.0.3/drivers/net/ksz884x.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ksz884x.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ksz884x.c linux-3.0.4/drivers/net/ksz884x.c
+--- linux-3.0.4/drivers/net/ksz884x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ksz884x.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str
  	int rc;
  	u64 counter[TOTAL_PORT_COUNTER_NUM];
@@ -28842,9 +28826,9 @@ diff -urNp linux-3.0.3/drivers/net/ksz884x.c linux-3.0.3/drivers/net/ksz884x.c
  	mutex_lock(&hw_priv->lock);
  	n = SWITCH_PORT_NUM;
  	for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
-diff -urNp linux-3.0.3/drivers/net/mlx4/main.c linux-3.0.3/drivers/net/mlx4/main.c
---- linux-3.0.3/drivers/net/mlx4/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/mlx4/main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main.c
+--- linux-3.0.4/drivers/net/mlx4/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/mlx4/main.c	2011-08-23 21:48:14.000000000 -0400
 @@ -40,6 +40,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/slab.h>
@@ -28862,9 +28846,9 @@ diff -urNp linux-3.0.3/drivers/net/mlx4/main.c linux-3.0.3/drivers/net/mlx4/main
  	err = mlx4_QUERY_FW(dev);
  	if (err) {
  		if (err == -EACCES)
-diff -urNp linux-3.0.3/drivers/net/niu.c linux-3.0.3/drivers/net/niu.c
---- linux-3.0.3/drivers/net/niu.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/niu.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/niu.c linux-3.0.4/drivers/net/niu.c
+--- linux-3.0.4/drivers/net/niu.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/niu.c	2011-08-23 21:48:14.000000000 -0400
 @@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc
  	int i, num_irqs, err;
  	u8 first_ldg;
@@ -28874,9 +28858,9 @@ diff -urNp linux-3.0.3/drivers/net/niu.c linux-3.0.3/drivers/net/niu.c
  	first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
  	for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
  		ldg_num_map[i] = first_ldg + i;
-diff -urNp linux-3.0.3/drivers/net/pcnet32.c linux-3.0.3/drivers/net/pcnet32.c
---- linux-3.0.3/drivers/net/pcnet32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/pcnet32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
+--- linux-3.0.4/drivers/net/pcnet32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/pcnet32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -29499,9 +29483,9 @@ diff -urNp linux-3.0.3/drivers/net/pcnet32.c linux-3.0.3/drivers/net/pcnet32.c
  			}
  		} else {
  			netif_info(lp, link, dev, "link up\n");
-diff -urNp linux-3.0.3/drivers/net/ppp_generic.c linux-3.0.3/drivers/net/ppp_generic.c
---- linux-3.0.3/drivers/net/ppp_generic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ppp_generic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ppp_generic.c linux-3.0.4/drivers/net/ppp_generic.c
+--- linux-3.0.4/drivers/net/ppp_generic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ppp_generic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
  	void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
  	struct ppp_stats stats;
@@ -29520,9 +29504,9 @@ diff -urNp linux-3.0.3/drivers/net/ppp_generic.c linux-3.0.3/drivers/net/ppp_gen
  			break;
  		err = 0;
  		break;
-diff -urNp linux-3.0.3/drivers/net/r8169.c linux-3.0.3/drivers/net/r8169.c
---- linux-3.0.3/drivers/net/r8169.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/r8169.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/r8169.c linux-3.0.4/drivers/net/r8169.c
+--- linux-3.0.4/drivers/net/r8169.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/r8169.c	2011-08-23 21:47:55.000000000 -0400
 @@ -645,12 +645,12 @@ struct rtl8169_private {
  	struct mdio_ops {
  		void (*write)(void __iomem *, int, int);
@@ -29538,9 +29522,9 @@ diff -urNp linux-3.0.3/drivers/net/r8169.c linux-3.0.3/drivers/net/r8169.c
  
  	int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
  	int (*get_settings)(struct net_device *, struct ethtool_cmd *);
-diff -urNp linux-3.0.3/drivers/net/tg3.h linux-3.0.3/drivers/net/tg3.h
---- linux-3.0.3/drivers/net/tg3.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tg3.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tg3.h linux-3.0.4/drivers/net/tg3.h
+--- linux-3.0.4/drivers/net/tg3.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tg3.h	2011-08-23 21:47:55.000000000 -0400
 @@ -134,6 +134,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
@@ -29549,9 +29533,9 @@ diff -urNp linux-3.0.3/drivers/net/tg3.h linux-3.0.3/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff -urNp linux-3.0.3/drivers/net/tokenring/abyss.c linux-3.0.3/drivers/net/tokenring/abyss.c
---- linux-3.0.3/drivers/net/tokenring/abyss.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/abyss.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/abyss.c linux-3.0.4/drivers/net/tokenring/abyss.c
+--- linux-3.0.4/drivers/net/tokenring/abyss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/abyss.c	2011-08-23 21:47:55.000000000 -0400
 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
  
  static int __init abyss_init (void)
@@ -29568,9 +29552,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/abyss.c linux-3.0.3/drivers/net/tok
  
  	return pci_register_driver(&abyss_driver);
  }
-diff -urNp linux-3.0.3/drivers/net/tokenring/madgemc.c linux-3.0.3/drivers/net/tokenring/madgemc.c
---- linux-3.0.3/drivers/net/tokenring/madgemc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/madgemc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/madgemc.c linux-3.0.4/drivers/net/tokenring/madgemc.c
+--- linux-3.0.4/drivers/net/tokenring/madgemc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/madgemc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver 
  
  static int __init madgemc_init (void)
@@ -29586,9 +29570,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/madgemc.c linux-3.0.3/drivers/net/t
  
  	return mca_register_driver (&madgemc_driver);
  }
-diff -urNp linux-3.0.3/drivers/net/tokenring/proteon.c linux-3.0.3/drivers/net/tokenring/proteon.c
---- linux-3.0.3/drivers/net/tokenring/proteon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/proteon.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/proteon.c linux-3.0.4/drivers/net/tokenring/proteon.c
+--- linux-3.0.4/drivers/net/tokenring/proteon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/proteon.c	2011-08-23 21:47:55.000000000 -0400
 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
  	struct platform_device *pdev;
  	int i, num = 0, err = 0;
@@ -29604,9 +29588,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/proteon.c linux-3.0.3/drivers/net/t
  
  	err = platform_driver_register(&proteon_driver);
  	if (err)
-diff -urNp linux-3.0.3/drivers/net/tokenring/skisa.c linux-3.0.3/drivers/net/tokenring/skisa.c
---- linux-3.0.3/drivers/net/tokenring/skisa.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/skisa.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/skisa.c linux-3.0.4/drivers/net/tokenring/skisa.c
+--- linux-3.0.4/drivers/net/tokenring/skisa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/skisa.c	2011-08-23 21:47:55.000000000 -0400
 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
  	struct platform_device *pdev;
  	int i, num = 0, err = 0;
@@ -29622,9 +29606,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/skisa.c linux-3.0.3/drivers/net/tok
  
  	err = platform_driver_register(&sk_isa_driver);
  	if (err)
-diff -urNp linux-3.0.3/drivers/net/tulip/de2104x.c linux-3.0.3/drivers/net/tulip/de2104x.c
---- linux-3.0.3/drivers/net/tulip/de2104x.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tulip/de2104x.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tulip/de2104x.c linux-3.0.4/drivers/net/tulip/de2104x.c
+--- linux-3.0.4/drivers/net/tulip/de2104x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tulip/de2104x.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i
  	struct de_srom_info_leaf *il;
  	void *bufp;
@@ -29634,9 +29618,9 @@ diff -urNp linux-3.0.3/drivers/net/tulip/de2104x.c linux-3.0.3/drivers/net/tulip
  	/* download entire eeprom */
  	for (i = 0; i < DE_EEPROM_WORDS; i++)
  		((__le16 *)ee_data)[i] =
-diff -urNp linux-3.0.3/drivers/net/tulip/de4x5.c linux-3.0.3/drivers/net/tulip/de4x5.c
---- linux-3.0.3/drivers/net/tulip/de4x5.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tulip/de4x5.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/de4x5.c
+--- linux-3.0.4/drivers/net/tulip/de4x5.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tulip/de4x5.c	2011-08-23 21:47:55.000000000 -0400
 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
@@ -29655,9 +29639,9 @@ diff -urNp linux-3.0.3/drivers/net/tulip/de4x5.c linux-3.0.3/drivers/net/tulip/d
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-3.0.3/drivers/net/usb/hso.c linux-3.0.3/drivers/net/usb/hso.c
---- linux-3.0.3/drivers/net/usb/hso.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/usb/hso.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/usb/hso.c linux-3.0.4/drivers/net/usb/hso.c
+--- linux-3.0.4/drivers/net/usb/hso.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/usb/hso.c	2011-08-23 21:47:55.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -29754,9 +29738,9 @@ diff -urNp linux-3.0.3/drivers/net/usb/hso.c linux-3.0.3/drivers/net/usb/hso.c
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-08-23 21:47:55.000000000 -0400
 @@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device 
  		 * Return with error code if any of the queue indices
  		 * is out of range
@@ -29767,9 +29751,9 @@ diff -urNp linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.3/drivers
  			return -EINVAL;
  	}
  
-diff -urNp linux-3.0.3/drivers/net/vxge/vxge-config.h linux-3.0.3/drivers/net/vxge/vxge-config.h
---- linux-3.0.3/drivers/net/vxge/vxge-config.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vxge/vxge-config.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vxge/vxge-config.h linux-3.0.4/drivers/net/vxge/vxge-config.h
+--- linux-3.0.4/drivers/net/vxge/vxge-config.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vxge/vxge-config.h	2011-08-23 21:47:55.000000000 -0400
 @@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs {
  	void (*link_down)(struct __vxge_hw_device *devh);
  	void (*crit_err)(struct __vxge_hw_device *devh,
@@ -29779,9 +29763,9 @@ diff -urNp linux-3.0.3/drivers/net/vxge/vxge-config.h linux-3.0.3/drivers/net/vx
  
  /*
   * struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-3.0.3/drivers/net/vxge/vxge-main.c linux-3.0.3/drivers/net/vxge/vxge-main.c
---- linux-3.0.3/drivers/net/vxge/vxge-main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vxge/vxge-main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge/vxge-main.c
+--- linux-3.0.4/drivers/net/vxge/vxge-main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vxge/vxge-main.c	2011-08-23 21:48:14.000000000 -0400
 @@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T
  	struct sk_buff *completed[NR_SKB_COMPLETED];
  	int more;
@@ -29800,9 +29784,9 @@ diff -urNp linux-3.0.3/drivers/net/vxge/vxge-main.c linux-3.0.3/drivers/net/vxge
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
-diff -urNp linux-3.0.3/drivers/net/vxge/vxge-traffic.h linux-3.0.3/drivers/net/vxge/vxge-traffic.h
---- linux-3.0.3/drivers/net/vxge/vxge-traffic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vxge/vxge-traffic.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vxge/vxge-traffic.h linux-3.0.4/drivers/net/vxge/vxge-traffic.h
+--- linux-3.0.4/drivers/net/vxge/vxge-traffic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vxge/vxge-traffic.h	2011-08-23 21:47:55.000000000 -0400
 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
  			struct vxge_hw_mempool_dma	*dma_object,
  			u32			index,
@@ -29812,9 +29796,9 @@ diff -urNp linux-3.0.3/drivers/net/vxge/vxge-traffic.h linux-3.0.3/drivers/net/v
  
  #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)				\
  		((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff -urNp linux-3.0.3/drivers/net/wan/cycx_x25.c linux-3.0.3/drivers/net/wan/cycx_x25.c
---- linux-3.0.3/drivers/net/wan/cycx_x25.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wan/cycx_x25.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wan/cycx_x25.c linux-3.0.4/drivers/net/wan/cycx_x25.c
+--- linux-3.0.4/drivers/net/wan/cycx_x25.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wan/cycx_x25.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
  	unsigned char hex[1024],
  	    	* phex = hex;
@@ -29824,9 +29808,9 @@ diff -urNp linux-3.0.3/drivers/net/wan/cycx_x25.c linux-3.0.3/drivers/net/wan/cy
  	if (len >= (sizeof(hex) / 2))
  		len = (sizeof(hex) / 2) - 1;
  
-diff -urNp linux-3.0.3/drivers/net/wan/hdlc_x25.c linux-3.0.3/drivers/net/wan/hdlc_x25.c
---- linux-3.0.3/drivers/net/wan/hdlc_x25.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wan/hdlc_x25.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wan/hdlc_x25.c linux-3.0.4/drivers/net/wan/hdlc_x25.c
+--- linux-3.0.4/drivers/net/wan/hdlc_x25.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wan/hdlc_x25.c	2011-08-23 21:47:55.000000000 -0400
 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
  
  static int x25_open(struct net_device *dev)
@@ -29852,9 +29836,9 @@ diff -urNp linux-3.0.3/drivers/net/wan/hdlc_x25.c linux-3.0.3/drivers/net/wan/hd
  	result = lapb_register(dev, &cb);
  	if (result != LAPB_OK)
  		return result;
-diff -urNp linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c
---- linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c	2011-08-23 21:48:14.000000000 -0400
 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
  	int do_autopm = 1;
  	DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -29864,9 +29848,9 @@ diff -urNp linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.3/drivers/net
  	d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
  		  i2400m, ack, ack_size);
  	BUG_ON(_ack == i2400m->bm_ack_buf);
-diff -urNp linux-3.0.3/drivers/net/wireless/airo.c linux-3.0.3/drivers/net/wireless/airo.c
---- linux-3.0.3/drivers/net/wireless/airo.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/airo.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/airo.c linux-3.0.4/drivers/net/wireless/airo.c
+--- linux-3.0.4/drivers/net/wireless/airo.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/airo.c	2011-08-23 21:48:14.000000000 -0400
 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
  	BSSListElement * loop_net;
  	BSSListElement * tmp_net;
@@ -29921,9 +29905,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/airo.c linux-3.0.3/drivers/net/wirel
  	/* Get stats out of the card */
  	clear_bit(JOB_WSTATS, &local->jobs);
  	if (local->power.event) {
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c
---- linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c	2011-08-23 21:48:14.000000000 -0400
 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
  	unsigned int v;
  	u64 tsf;
@@ -29987,9 +29971,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.3/driver
  	len += snprintf(buf+len, sizeof(buf)-len,
  			"available txbuffers: %d\n", sc->txbuf_len);
  
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-08-23 21:48:14.000000000 -0400
 @@ -757,6 +757,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
  	int i, im, j;
  	int nmeasurement;
@@ -29999,9 +29983,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.3
  	for (i = 0; i < AR9300_MAX_CHAINS; i++) {
  		if (ah->txchainmask & (1 << i))
  			num_chains++;
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-08-23 21:48:14.000000000 -0400
 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
  	int theta_low_bin = 0;
  	int i;
@@ -30011,9 +29995,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.3
  	/* disregard any bin that contains <= 16 samples */
  	thresh_accum_cnt = 16;
  	scale_factor = 5;
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c	2011-08-23 21:48:14.000000000 -0400
 @@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc
  	char buf[512];
  	unsigned int len = 0;
@@ -30032,9 +30016,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.3/driver
  	len += snprintf(buf + len, sizeof(buf) - len,
  			"%s (chan=%d  center-freq: %d MHz  channel-type: %d (%s))\n",
  			wiphy_name(sc->hw->wiphy),
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-08-23 21:48:14.000000000 -0400
 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
  	unsigned int len = 0;
  	int ret = 0;
@@ -30089,9 +30073,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.
  	len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n",
  			"Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue));
  
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:47:55.000000000 -0400
 @@ -585,7 +585,7 @@ struct ath_hw_private_ops {
  
  	/* ANI */
@@ -30119,9 +30103,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.3/drivers/n
  
  	struct ieee80211_hw *hw;
  	struct ath_common common;
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath.h linux-3.0.3/drivers/net/wireless/ath/ath.h
---- linux-3.0.3/drivers/net/wireless/ath/ath.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath.h linux-3.0.4/drivers/net/wireless/ath/ath.h
+--- linux-3.0.4/drivers/net/wireless/ath/ath.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath.h	2011-08-23 21:47:55.000000000 -0400
 @@ -121,6 +121,7 @@ struct ath_ops {
  	void (*write_flush) (void *);
  	u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
@@ -30130,9 +30114,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath.h linux-3.0.3/drivers/net/wi
  
  struct ath_common;
  struct ath_bus_ops;
-diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
  	int err;
  	DECLARE_SSID_BUF(ssid);
@@ -30151,9 +30135,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.3/driver
  	IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
  		     idx, keylen, len);
  
-diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
  	unsigned long flags;
  	DECLARE_SSID_BUF(ssid);
@@ -30163,9 +30147,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.3/driv
  	LIBIPW_DEBUG_SCAN("'%s' (%pM"
  		     "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
  		     print_ssid(ssid, info_element->data, info_element->len),
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-08-23 21:47:55.000000000 -0400
 @@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_
  	 */
  	if (iwl3945_mod_params.disable_hw_scan) {
@@ -30177,9 +30161,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.3/
  	}
  
  	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s
  	struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
  	struct iwl_rxon_context *ctx = sta_priv->common.ctx;
@@ -30198,9 +30182,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.3/dri
  	/* Override starting rate (index 0) if needed for debug purposes */
  	rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str
  	int pos = 0;
  	const size_t bufsz = sizeof(buf);
@@ -30219,9 +30203,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.3/dr
  	for_each_context(priv, ctx) {
  		pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
  				 ctx->ctxid);
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-08-23 21:47:55.000000000 -0400
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -30233,9 +30217,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.3/driv
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
  				      const void *p, u32 len)
  {}
-diff -urNp linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
  	int buf_len = 512;
  	size_t len = 0;
@@ -30245,9 +30229,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.3/d
  	if (*ppos != 0)
  		return 0;
  	if (count < sizeof(buf))
-diff -urNp linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
  		return -EINVAL;
  
@@ -30263,9 +30247,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c linux-3.0.3/drivers
  	}
  
  	spin_lock_init(&hwsim_radio_lock);
-diff -urNp linux-3.0.3/drivers/net/wireless/rndis_wlan.c linux-3.0.3/drivers/net/wireless/rndis_wlan.c
---- linux-3.0.3/drivers/net/wireless/rndis_wlan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/rndis_wlan.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/rndis_wlan.c linux-3.0.4/drivers/net/wireless/rndis_wlan.c
+--- linux-3.0.4/drivers/net/wireless/rndis_wlan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/rndis_wlan.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
  	netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -30275,9 +30259,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/rndis_wlan.c linux-3.0.3/drivers/net
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-08-23 21:48:14.000000000 -0400
 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
  	u8 rfpath;
  	u8 num_total_rfpath = rtlphy->num_total_rfpath;
@@ -30287,9 +30271,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-
  	precommoncmdcnt = 0;
  	_rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
  					 MAX_PRECMD_CNT,
-diff -urNp linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h
---- linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h	2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
  	void (*reset)(struct wl1251 *wl);
  	void (*enable_irq)(struct wl1251 *wl);
@@ -30299,9 +30283,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h linux-3.0.3/drivers/
  
  struct wl1251 {
  	struct ieee80211_hw *hw;
-diff -urNp linux-3.0.3/drivers/net/wireless/wl12xx/spi.c linux-3.0.3/drivers/net/wireless/wl12xx/spi.c
---- linux-3.0.3/drivers/net/wireless/wl12xx/spi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/wl12xx/spi.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/wl12xx/spi.c linux-3.0.4/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.0.4/drivers/net/wireless/wl12xx/spi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/wl12xx/spi.c	2011-08-23 21:48:14.000000000 -0400
 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct 
  	u32 chunk_len;
  	int i;
@@ -30311,9 +30295,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/wl12xx/spi.c linux-3.0.3/drivers/net
  	WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
  	spi_message_init(&m);
-diff -urNp linux-3.0.3/drivers/oprofile/buffer_sync.c linux-3.0.3/drivers/oprofile/buffer_sync.c
---- linux-3.0.3/drivers/oprofile/buffer_sync.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/buffer_sync.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/buffer_sync.c linux-3.0.4/drivers/oprofile/buffer_sync.c
+--- linux-3.0.4/drivers/oprofile/buffer_sync.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/buffer_sync.c	2011-08-23 21:47:55.000000000 -0400
 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
@@ -30349,9 +30333,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/buffer_sync.c linux-3.0.3/drivers/oprofi
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-3.0.3/drivers/oprofile/event_buffer.c linux-3.0.3/drivers/oprofile/event_buffer.c
---- linux-3.0.3/drivers/oprofile/event_buffer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/event_buffer.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/event_buffer.c linux-3.0.4/drivers/oprofile/event_buffer.c
+--- linux-3.0.4/drivers/oprofile/event_buffer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/event_buffer.c	2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -30361,9 +30345,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/event_buffer.c linux-3.0.3/drivers/oprof
  		return;
  	}
  
-diff -urNp linux-3.0.3/drivers/oprofile/oprof.c linux-3.0.3/drivers/oprofile/oprof.c
---- linux-3.0.3/drivers/oprofile/oprof.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprof.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprof.c linux-3.0.4/drivers/oprofile/oprof.c
+--- linux-3.0.4/drivers/oprofile/oprof.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprof.c	2011-08-23 21:47:55.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
@@ -30373,9 +30357,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprof.c linux-3.0.3/drivers/oprofile/opr
  	start_switch_worker();
  }
  
-diff -urNp linux-3.0.3/drivers/oprofile/oprofilefs.c linux-3.0.3/drivers/oprofile/oprofilefs.c
---- linux-3.0.3/drivers/oprofile/oprofilefs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprofilefs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprofilefs.c linux-3.0.4/drivers/oprofile/oprofilefs.c
+--- linux-3.0.4/drivers/oprofile/oprofilefs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprofilefs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
@@ -30385,9 +30369,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprofilefs.c linux-3.0.3/drivers/oprofil
  {
  	return __oprofilefs_create_file(sb, root, name,
  					&atomic_ro_fops, 0444, val);
-diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.c linux-3.0.3/drivers/oprofile/oprofile_stats.c
---- linux-3.0.3/drivers/oprofile/oprofile_stats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprofile_stats.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.c linux-3.0.4/drivers/oprofile/oprofile_stats.c
+--- linux-3.0.4/drivers/oprofile/oprofile_stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprofile_stats.c	2011-08-23 21:47:55.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -30405,9 +30389,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.c linux-3.0.3/drivers/opr
  }
  
  
-diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.h linux-3.0.3/drivers/oprofile/oprofile_stats.h
---- linux-3.0.3/drivers/oprofile/oprofile_stats.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprofile_stats.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.h linux-3.0.4/drivers/oprofile/oprofile_stats.h
+--- linux-3.0.4/drivers/oprofile/oprofile_stats.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprofile_stats.h	2011-08-23 21:47:55.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -30425,9 +30409,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.h linux-3.0.3/drivers/opr
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-3.0.3/drivers/parport/procfs.c linux-3.0.3/drivers/parport/procfs.c
---- linux-3.0.3/drivers/parport/procfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/parport/procfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/parport/procfs.c linux-3.0.4/drivers/parport/procfs.c
+--- linux-3.0.4/drivers/parport/procfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/parport/procfs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
@@ -30446,9 +30430,9 @@ diff -urNp linux-3.0.3/drivers/parport/procfs.c linux-3.0.3/drivers/parport/proc
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h
---- linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h	2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
  	int (*hardware_test) (struct slot* slot, u32 value);
  	u8  (*get_power) (struct slot* slot);
@@ -30458,9 +30442,9 @@ diff -urNp linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.3/drivers/pc
  
  struct cpci_hp_controller {
  	unsigned int irq;
-diff -urNp linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-08-23 21:47:55.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -30475,9 +30459,9 @@ diff -urNp linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.3/drivers/pc
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-3.0.3/drivers/pci/pcie/aspm.c linux-3.0.3/drivers/pci/pcie/aspm.c
---- linux-3.0.3/drivers/pci/pcie/aspm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/pcie/aspm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/pcie/aspm.c linux-3.0.4/drivers/pci/pcie/aspm.c
+--- linux-3.0.4/drivers/pci/pcie/aspm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/pcie/aspm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -30491,9 +30475,9 @@ diff -urNp linux-3.0.3/drivers/pci/pcie/aspm.c linux-3.0.3/drivers/pci/pcie/aspm
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-3.0.3/drivers/pci/probe.c linux-3.0.3/drivers/pci/probe.c
---- linux-3.0.3/drivers/pci/probe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/probe.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/probe.c linux-3.0.4/drivers/pci/probe.c
+--- linux-3.0.4/drivers/pci/probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/probe.c	2011-08-23 21:47:55.000000000 -0400
 @@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev,
  	u32 l, sz, mask;
  	u16 orig_cmd;
@@ -30503,9 +30487,9 @@ diff -urNp linux-3.0.3/drivers/pci/probe.c linux-3.0.3/drivers/pci/probe.c
  
  	if (!dev->mmio_always_on) {
  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-3.0.3/drivers/pci/proc.c linux-3.0.3/drivers/pci/proc.c
---- linux-3.0.3/drivers/pci/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/proc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/proc.c linux-3.0.4/drivers/pci/proc.c
+--- linux-3.0.4/drivers/pci/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/proc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -30523,9 +30507,9 @@ diff -urNp linux-3.0.3/drivers/pci/proc.c linux-3.0.3/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-3.0.3/drivers/pci/xen-pcifront.c linux-3.0.3/drivers/pci/xen-pcifront.c
---- linux-3.0.3/drivers/pci/xen-pcifront.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/xen-pcifront.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/xen-pcifront.c linux-3.0.4/drivers/pci/xen-pcifront.c
+--- linux-3.0.4/drivers/pci/xen-pcifront.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/xen-pcifront.c	2011-08-23 21:48:14.000000000 -0400
 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
  	struct pcifront_sd *sd = bus->sysdata;
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
@@ -30571,9 +30555,9 @@ diff -urNp linux-3.0.3/drivers/pci/xen-pcifront.c linux-3.0.3/drivers/pci/xen-pc
  	err = do_pci_op(pdev, &op);
  	if (likely(!err)) {
  		vector[0] = op.value;
-diff -urNp linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c
---- linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
  	return 0;
  }
@@ -30583,9 +30567,9 @@ diff -urNp linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c linux-3.0.3/drivers/
  {
  	/* log only what the user can fix... */
  	const u32 wantedmask = hotkey_driver_mask &
-diff -urNp linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c
---- linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c	2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -30642,9 +30626,9 @@ diff -urNp linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c linux-3.0.3/drivers/pnp/p
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-3.0.3/drivers/pnp/resource.c linux-3.0.3/drivers/pnp/resource.c
---- linux-3.0.3/drivers/pnp/resource.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pnp/resource.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pnp/resource.c linux-3.0.4/drivers/pnp/resource.c
+--- linux-3.0.4/drivers/pnp/resource.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pnp/resource.c	2011-08-23 21:47:55.000000000 -0400
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
@@ -30663,9 +30647,9 @@ diff -urNp linux-3.0.3/drivers/pnp/resource.c linux-3.0.3/drivers/pnp/resource.c
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-3.0.3/drivers/power/bq27x00_battery.c linux-3.0.3/drivers/power/bq27x00_battery.c
---- linux-3.0.3/drivers/power/bq27x00_battery.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/power/bq27x00_battery.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/power/bq27x00_battery.c linux-3.0.4/drivers/power/bq27x00_battery.c
+--- linux-3.0.4/drivers/power/bq27x00_battery.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/power/bq27x00_battery.c	2011-08-23 21:47:55.000000000 -0400
 @@ -67,7 +67,7 @@
  struct bq27x00_device_info;
  struct bq27x00_access_methods {
@@ -30675,9 +30659,9 @@ diff -urNp linux-3.0.3/drivers/power/bq27x00_battery.c linux-3.0.3/drivers/power
  
  enum bq27x00_chip { BQ27000, BQ27500 };
  
-diff -urNp linux-3.0.3/drivers/regulator/max8660.c linux-3.0.3/drivers/regulator/max8660.c
---- linux-3.0.3/drivers/regulator/max8660.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/regulator/max8660.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/regulator/max8660.c linux-3.0.4/drivers/regulator/max8660.c
+--- linux-3.0.4/drivers/regulator/max8660.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/regulator/max8660.c	2011-08-23 21:47:55.000000000 -0400
 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
  		max8660->shadow_regs[MAX8660_OVER1] = 5;
  	} else {
@@ -30691,9 +30675,9 @@ diff -urNp linux-3.0.3/drivers/regulator/max8660.c linux-3.0.3/drivers/regulator
  	}
  
  	/*
-diff -urNp linux-3.0.3/drivers/regulator/mc13892-regulator.c linux-3.0.3/drivers/regulator/mc13892-regulator.c
---- linux-3.0.3/drivers/regulator/mc13892-regulator.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/regulator/mc13892-regulator.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/regulator/mc13892-regulator.c linux-3.0.4/drivers/regulator/mc13892-regulator.c
+--- linux-3.0.4/drivers/regulator/mc13892-regulator.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/regulator/mc13892-regulator.c	2011-08-23 21:47:55.000000000 -0400
 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
  	}
  	mc13xxx_unlock(mc13892);
@@ -30709,9 +30693,9 @@ diff -urNp linux-3.0.3/drivers/regulator/mc13892-regulator.c linux-3.0.3/drivers
  	for (i = 0; i < pdata->num_regulators; i++) {
  		init_data = &pdata->regulators[i];
  		priv->regulators[i] = regulator_register(
-diff -urNp linux-3.0.3/drivers/rtc/rtc-dev.c linux-3.0.3/drivers/rtc/rtc-dev.c
---- linux-3.0.3/drivers/rtc/rtc-dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/rtc/rtc-dev.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/rtc/rtc-dev.c linux-3.0.4/drivers/rtc/rtc-dev.c
+--- linux-3.0.4/drivers/rtc/rtc-dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/rtc/rtc-dev.c	2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -30729,9 +30713,9 @@ diff -urNp linux-3.0.3/drivers/rtc/rtc-dev.c linux-3.0.3/drivers/rtc/rtc-dev.c
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-3.0.3/drivers/scsi/aacraid/aacraid.h linux-3.0.3/drivers/scsi/aacraid/aacraid.h
---- linux-3.0.3/drivers/scsi/aacraid/aacraid.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/aacraid/aacraid.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/aacraid/aacraid.h linux-3.0.4/drivers/scsi/aacraid/aacraid.h
+--- linux-3.0.4/drivers/scsi/aacraid/aacraid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/aacraid/aacraid.h	2011-08-23 21:47:55.000000000 -0400
 @@ -492,7 +492,7 @@ struct adapter_ops
  	int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
  	/* Administrative operations */
@@ -30741,9 +30725,9 @@ diff -urNp linux-3.0.3/drivers/scsi/aacraid/aacraid.h linux-3.0.3/drivers/scsi/a
  
  /*
   *	Define which interrupt handler needs to be installed
-diff -urNp linux-3.0.3/drivers/scsi/aacraid/commctrl.c linux-3.0.3/drivers/scsi/aacraid/commctrl.c
---- linux-3.0.3/drivers/scsi/aacraid/commctrl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/aacraid/commctrl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/aacraid/commctrl.c linux-3.0.4/drivers/scsi/aacraid/commctrl.c
+--- linux-3.0.4/drivers/scsi/aacraid/commctrl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/aacraid/commctrl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
  	u32 actual_fibsize64, actual_fibsize = 0;
  	int i;
@@ -30752,9 +30736,9 @@ diff -urNp linux-3.0.3/drivers/scsi/aacraid/commctrl.c linux-3.0.3/drivers/scsi/
  
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfad.c linux-3.0.3/drivers/scsi/bfa/bfad.c
---- linux-3.0.3/drivers/scsi/bfa/bfad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfad.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfad.c linux-3.0.4/drivers/scsi/bfa/bfad.c
+--- linux-3.0.4/drivers/scsi/bfa/bfad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfad.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) {
  	struct bfad_vport_s *vport, *vport_new;
  	struct bfa_fcs_driver_info_s driver_info;
@@ -30764,9 +30748,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfad.c linux-3.0.3/drivers/scsi/bfa/bfad
  	/* Fill the driver_info info to fcs*/
  	memset(&driver_info, 0, sizeof(driver_info));
  	strncpy(driver_info.version, BFAD_DRIVER_VERSION,
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
  	u16        len, count;
  	u16	templen;
@@ -30785,9 +30769,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.3/drivers/scsi
  	/*
  	 * get port attributes
  	 */
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
  	struct fc_rpsc_speed_info_s speeds;
  	struct bfa_port_attr_s pport_attr;
@@ -30797,9 +30781,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.3/drivers/scsi
  	bfa_trc(port->fcs, rx_fchs->s_id);
  	bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa.h linux-3.0.3/drivers/scsi/bfa/bfa.h
---- linux-3.0.3/drivers/scsi/bfa/bfa.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa.h linux-3.0.4/drivers/scsi/bfa/bfa.h
+--- linux-3.0.4/drivers/scsi/bfa/bfa.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa.h	2011-08-23 21:47:55.000000000 -0400
 @@ -238,7 +238,7 @@ struct bfa_hwif_s {
  				u32 *nvecs, u32 *maxvec);
  	void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
@@ -30809,9 +30793,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa.h linux-3.0.3/drivers/scsi/bfa/bfa.h
  typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
  
  struct bfa_iocfc_s {
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h
---- linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h	2011-08-23 21:47:55.000000000 -0400
 @@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s {
  	bfa_ioc_disable_cbfn_t	disable_cbfn;
  	bfa_ioc_hbfail_cbfn_t	hbfail_cbfn;
@@ -30830,9 +30814,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h linux-3.0.3/drivers/scsi/bfa/b
  
  #define bfa_ioc_pcifn(__ioc)		((__ioc)->pcidev.pci_func)
  #define bfa_ioc_devid(__ioc)		((__ioc)->pcidev.device_id)
-diff -urNp linux-3.0.3/drivers/scsi/BusLogic.c linux-3.0.3/drivers/scsi/BusLogic.c
---- linux-3.0.3/drivers/scsi/BusLogic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/BusLogic.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/BusLogic.c linux-3.0.4/drivers/scsi/BusLogic.c
+--- linux-3.0.4/drivers/scsi/BusLogic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/BusLogic.c	2011-08-23 21:48:14.000000000 -0400
 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
  static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
  						    *PrototypeHostAdapter)
@@ -30842,9 +30826,9 @@ diff -urNp linux-3.0.3/drivers/scsi/BusLogic.c linux-3.0.3/drivers/scsi/BusLogic
  	/*
  	   If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
  	   Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
-diff -urNp linux-3.0.3/drivers/scsi/dpt_i2o.c linux-3.0.3/drivers/scsi/dpt_i2o.c
---- linux-3.0.3/drivers/scsi/dpt_i2o.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/dpt_i2o.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/dpt_i2o.c linux-3.0.4/drivers/scsi/dpt_i2o.c
+--- linux-3.0.4/drivers/scsi/dpt_i2o.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/dpt_i2o.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
  	dma_addr_t addr;
  	ulong flags = 0;
@@ -30863,9 +30847,9 @@ diff -urNp linux-3.0.3/drivers/scsi/dpt_i2o.c linux-3.0.3/drivers/scsi/dpt_i2o.c
  	memset(msg, 0 , sizeof(msg));
  	len = scsi_bufflen(cmd);
  	direction = 0x00000000;	
-diff -urNp linux-3.0.3/drivers/scsi/eata.c linux-3.0.3/drivers/scsi/eata.c
---- linux-3.0.3/drivers/scsi/eata.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/eata.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/eata.c linux-3.0.4/drivers/scsi/eata.c
+--- linux-3.0.4/drivers/scsi/eata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/eata.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
  	struct hostdata *ha;
  	char name[16];
@@ -30875,9 +30859,9 @@ diff -urNp linux-3.0.3/drivers/scsi/eata.c linux-3.0.3/drivers/scsi/eata.c
  	sprintf(name, "%s%d", driver_name, j);
  
  	if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
  	} buf;
  	int rc;
@@ -30887,9 +30871,9 @@ diff -urNp linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.3/drivers/scsi/fc
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  
-diff -urNp linux-3.0.3/drivers/scsi/gdth.c linux-3.0.3/drivers/scsi/gdth.c
---- linux-3.0.3/drivers/scsi/gdth.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/gdth.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/gdth.c linux-3.0.4/drivers/scsi/gdth.c
+--- linux-3.0.4/drivers/scsi/gdth.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/gdth.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
      unsigned long flags;
      gdth_ha_str *ha;
@@ -30927,9 +30911,9 @@ diff -urNp linux-3.0.3/drivers/scsi/gdth.c linux-3.0.3/drivers/scsi/gdth.c
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-3.0.3/drivers/scsi/gdth_proc.c linux-3.0.3/drivers/scsi/gdth_proc.c
---- linux-3.0.3/drivers/scsi/gdth_proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/gdth_proc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/gdth_proc.c linux-3.0.4/drivers/scsi/gdth_proc.c
+--- linux-3.0.4/drivers/scsi/gdth_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/gdth_proc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
      u64         paddr;
  
@@ -30949,9 +30933,9 @@ diff -urNp linux-3.0.3/drivers/scsi/gdth_proc.c linux-3.0.3/drivers/scsi/gdth_pr
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-3.0.3/drivers/scsi/hosts.c linux-3.0.3/drivers/scsi/hosts.c
---- linux-3.0.3/drivers/scsi/hosts.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/hosts.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
+--- linux-3.0.4/drivers/scsi/hosts.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/hosts.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -30970,9 +30954,9 @@ diff -urNp linux-3.0.3/drivers/scsi/hosts.c linux-3.0.3/drivers/scsi/hosts.c
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff -urNp linux-3.0.3/drivers/scsi/hpsa.c linux-3.0.3/drivers/scsi/hpsa.c
---- linux-3.0.3/drivers/scsi/hpsa.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/hpsa.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
+--- linux-3.0.4/drivers/scsi/hpsa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/hpsa.c	2011-08-23 21:47:55.000000000 -0400
 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
  	u32 a;
  
@@ -31087,9 +31071,9 @@ diff -urNp linux-3.0.3/drivers/scsi/hpsa.c linux-3.0.3/drivers/scsi/hpsa.c
  	h->transMethod = CFGTBL_Trans_Performant;
  }
  
-diff -urNp linux-3.0.3/drivers/scsi/hpsa.h linux-3.0.3/drivers/scsi/hpsa.h
---- linux-3.0.3/drivers/scsi/hpsa.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/hpsa.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/hpsa.h linux-3.0.4/drivers/scsi/hpsa.h
+--- linux-3.0.4/drivers/scsi/hpsa.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/scsi/hpsa.h	2011-08-23 21:47:55.000000000 -0400
 @@ -73,7 +73,7 @@ struct ctlr_info {
  	unsigned int msix_vector;
  	unsigned int msi_vector;
@@ -31099,9 +31083,9 @@ diff -urNp linux-3.0.3/drivers/scsi/hpsa.h linux-3.0.3/drivers/scsi/hpsa.h
  
  	/* queue and queue Info */
  	struct list_head reqQ;
-diff -urNp linux-3.0.3/drivers/scsi/ips.h linux-3.0.3/drivers/scsi/ips.h
---- linux-3.0.3/drivers/scsi/ips.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/ips.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/ips.h linux-3.0.4/drivers/scsi/ips.h
+--- linux-3.0.4/drivers/scsi/ips.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/ips.h	2011-08-23 21:47:55.000000000 -0400
 @@ -1027,7 +1027,7 @@ typedef struct {
     int       (*intr)(struct ips_ha *);
     void      (*enableint)(struct ips_ha *);
@@ -31111,9 +31095,9 @@ diff -urNp linux-3.0.3/drivers/scsi/ips.h linux-3.0.3/drivers/scsi/ips.h
  
  typedef struct ips_ha {
     uint8_t            ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-3.0.3/drivers/scsi/libfc/fc_exch.c linux-3.0.3/drivers/scsi/libfc/fc_exch.c
---- linux-3.0.3/drivers/scsi/libfc/fc_exch.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/libfc/fc_exch.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/libfc/fc_exch.c
+--- linux-3.0.4/drivers/scsi/libfc/fc_exch.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/libfc/fc_exch.c	2011-08-23 21:47:55.000000000 -0400
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -31235,9 +31219,9 @@ diff -urNp linux-3.0.3/drivers/scsi/libfc/fc_exch.c linux-3.0.3/drivers/scsi/lib
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-3.0.3/drivers/scsi/libsas/sas_ata.c linux-3.0.3/drivers/scsi/libsas/sas_ata.c
---- linux-3.0.3/drivers/scsi/libsas/sas_ata.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/libsas/sas_ata.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/libsas/sas_ata.c linux-3.0.4/drivers/scsi/libsas/sas_ata.c
+--- linux-3.0.4/drivers/scsi/libsas/sas_ata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/libsas/sas_ata.c	2011-08-23 21:47:55.000000000 -0400
 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
  	.postreset		= ata_std_postreset,
  	.error_handler		= ata_std_error_handler,
@@ -31247,9 +31231,9 @@ diff -urNp linux-3.0.3/drivers/scsi/libsas/sas_ata.c linux-3.0.3/drivers/scsi/li
  	.qc_prep		= ata_noop_qc_prep,
  	.qc_issue		= sas_ata_qc_issue,
  	.qc_fill_rtf		= sas_ata_qc_fill_rtf,
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
  
  #include <linux/debugfs.h>
@@ -31338,9 +31322,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.3/drivers/scsi
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc.h linux-3.0.3/drivers/scsi/lpfc/lpfc.h
---- linux-3.0.3/drivers/scsi/lpfc/lpfc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lpfc.h
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc.h	2011-08-23 21:47:55.000000000 -0400
 @@ -420,7 +420,7 @@ struct lpfc_vport {
  	struct dentry *debug_nodelist;
  	struct dentry *vport_debugfs_root;
@@ -31370,9 +31354,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc.h linux-3.0.3/drivers/scsi/lpfc/lp
  	/* iDiag debugfs sub-directory */
  	struct dentry *idiag_root;
  	struct dentry *idiag_pci_cfg;
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c
---- linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c	2011-08-23 21:47:56.000000000 -0400
 @@ -9923,8 +9923,10 @@ lpfc_init(void)
  	printk(LPFC_COPYRIGHT "\n");
  
@@ -31386,9 +31370,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c linux-3.0.3/drivers/scsi/lp
  	}
  	lpfc_transport_template =
  				fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-08-23 21:47:56.000000000 -0400
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
@@ -31440,9 +31424,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.3/drivers/scsi/lp
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c	2011-08-23 21:48:14.000000000 -0400
 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
  	int		rval;
  	int		i;
@@ -31452,9 +31436,9 @@ diff -urNp linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.3/drivers
  	// Allocate memory for the base list of scb for management module.
  	adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
  
-diff -urNp linux-3.0.3/drivers/scsi/osd/osd_initiator.c linux-3.0.3/drivers/scsi/osd/osd_initiator.c
---- linux-3.0.3/drivers/scsi/osd/osd_initiator.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/osd/osd_initiator.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/osd/osd_initiator.c linux-3.0.4/drivers/scsi/osd/osd_initiator.c
+--- linux-3.0.4/drivers/scsi/osd/osd_initiator.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/osd/osd_initiator.c	2011-08-23 21:48:14.000000000 -0400
 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
  	int nelem = ARRAY_SIZE(get_attrs), a = 0;
  	int ret;
@@ -31464,9 +31448,9 @@ diff -urNp linux-3.0.3/drivers/scsi/osd/osd_initiator.c linux-3.0.3/drivers/scsi
  	or = osd_start_request(od, GFP_KERNEL);
  	if (!or)
  		return -ENOMEM;
-diff -urNp linux-3.0.3/drivers/scsi/pmcraid.c linux-3.0.3/drivers/scsi/pmcraid.c
---- linux-3.0.3/drivers/scsi/pmcraid.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/pmcraid.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/pmcraid.c linux-3.0.4/drivers/scsi/pmcraid.c
+--- linux-3.0.4/drivers/scsi/pmcraid.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/scsi/pmcraid.c	2011-08-23 21:47:56.000000000 -0400
 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
  		res->scsi_dev = scsi_dev;
  		scsi_dev->hostdata = res;
@@ -31537,9 +31521,9 @@ diff -urNp linux-3.0.3/drivers/scsi/pmcraid.c linux-3.0.3/drivers/scsi/pmcraid.c
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff -urNp linux-3.0.3/drivers/scsi/pmcraid.h linux-3.0.3/drivers/scsi/pmcraid.h
---- linux-3.0.3/drivers/scsi/pmcraid.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/pmcraid.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/pmcraid.h linux-3.0.4/drivers/scsi/pmcraid.h
+--- linux-3.0.4/drivers/scsi/pmcraid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/pmcraid.h	2011-08-23 21:47:56.000000000 -0400
 @@ -749,7 +749,7 @@ struct pmcraid_instance {
  	struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
@@ -31569,9 +31553,9 @@ diff -urNp linux-3.0.3/drivers/scsi/pmcraid.h linux-3.0.3/drivers/scsi/pmcraid.h
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff -urNp linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h
---- linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h	2011-08-23 21:47:56.000000000 -0400
 @@ -2244,7 +2244,7 @@ struct isp_operations {
  	int (*get_flash_version) (struct scsi_qla_host *, void *);
  	int (*start_scsi) (srb_t *);
@@ -31581,9 +31565,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h linux-3.0.3/drivers/scsi/q
  
  /* MSI-X Support *************************************************************/
  
-diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h
---- linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h	2011-08-23 21:47:56.000000000 -0400
 @@ -256,7 +256,7 @@ struct ddb_entry {
  	atomic_t retry_relogin_timer; /* Min Time between relogins
  				       * (4000 only) */
@@ -31593,9 +31577,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.3/drivers/scsi/q
  				       * retried */
  
  	uint16_t port;
-diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c
---- linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c	2011-08-23 21:47:56.000000000 -0400
 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
  	ddb_entry->fw_ddb_index = fw_ddb_index;
  	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -31614,9 +31598,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.3/drivers/scsi/
  		atomic_set(&ddb_entry->relogin_timer, 0);
  		clear_bit(DF_RELOGIN, &ddb_entry->flags);
  		iscsi_unblock_session(ddb_entry->sess);
-diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c
---- linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c	2011-08-23 21:47:56.000000000 -0400
 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
  			    ddb_entry->fw_ddb_device_state ==
  			    DDB_DS_SESSION_FAILED) {
@@ -31633,9 +31617,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.3/drivers/scsi/ql
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff -urNp linux-3.0.3/drivers/scsi/scsi.c linux-3.0.3/drivers/scsi/scsi.c
---- linux-3.0.3/drivers/scsi/scsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi.c linux-3.0.4/drivers/scsi/scsi.c
+--- linux-3.0.4/drivers/scsi/scsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi.c	2011-08-23 21:47:56.000000000 -0400
 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
  	unsigned long timeout;
  	int rtn = 0;
@@ -31645,9 +31629,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi.c linux-3.0.3/drivers/scsi/scsi.c
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-3.0.3/drivers/scsi/scsi_debug.c linux-3.0.3/drivers/scsi/scsi_debug.c
---- linux-3.0.3/drivers/scsi/scsi_debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_debug.c linux-3.0.4/drivers/scsi/scsi_debug.c
+--- linux-3.0.4/drivers/scsi/scsi_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_debug.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
  	unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
  	unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -31666,9 +31650,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_debug.c linux-3.0.3/drivers/scsi/scsi_d
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-diff -urNp linux-3.0.3/drivers/scsi/scsi_lib.c linux-3.0.3/drivers/scsi/scsi_lib.c
---- linux-3.0.3/drivers/scsi/scsi_lib.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_lib.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib.c
+--- linux-3.0.4/drivers/scsi/scsi_lib.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_lib.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
@@ -31690,9 +31674,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_lib.c linux-3.0.3/drivers/scsi/scsi_lib
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff -urNp linux-3.0.3/drivers/scsi/scsi_sysfs.c linux-3.0.3/drivers/scsi/scsi_sysfs.c
---- linux-3.0.3/drivers/scsi/scsi_sysfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_sysfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_sysfs.c linux-3.0.4/drivers/scsi/scsi_sysfs.c
+--- linux-3.0.4/drivers/scsi/scsi_sysfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_sysfs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, 
  		    char *buf)						\
  {									\
@@ -31702,9 +31686,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_sysfs.c linux-3.0.3/drivers/scsi/scsi_s
  	return snprintf(buf, 20, "0x%llx\n", count);			\
  }									\
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_fc.c linux-3.0.3/drivers/scsi/scsi_transport_fc.c
---- linux-3.0.3/drivers/scsi/scsi_transport_fc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_transport_fc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_fc.c linux-3.0.4/drivers/scsi/scsi_transport_fc.c
+--- linux-3.0.4/drivers/scsi/scsi_transport_fc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_transport_fc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
@@ -31741,9 +31725,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_fc.c linux-3.0.3/drivers/scsi
  		return -EINVAL;
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c	2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ struct iscsi_internal {
  	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -31771,9 +31755,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c linux-3.0.3/drivers/s
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_srp.c linux-3.0.3/drivers/scsi/scsi_transport_srp.c
---- linux-3.0.3/drivers/scsi/scsi_transport_srp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_transport_srp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_srp.c linux-3.0.4/drivers/scsi/scsi_transport_srp.c
+--- linux-3.0.4/drivers/scsi/scsi_transport_srp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_transport_srp.c	2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -31801,9 +31785,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_srp.c linux-3.0.3/drivers/scs
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff -urNp linux-3.0.3/drivers/scsi/sg.c linux-3.0.3/drivers/scsi/sg.c
---- linux-3.0.3/drivers/scsi/sg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/sg.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/sg.c linux-3.0.4/drivers/scsi/sg.c
+--- linux-3.0.4/drivers/scsi/sg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/sg.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
@@ -31822,9 +31806,9 @@ diff -urNp linux-3.0.3/drivers/scsi/sg.c linux-3.0.3/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
  	int do_iounmap = 0;
  	int do_disable_device = 1;
@@ -31834,9 +31818,9 @@ diff -urNp linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.3/drivers/s
  	memset(&sym_dev, 0, sizeof(sym_dev));
  	memset(&nvram, 0, sizeof(nvram));
  	sym_dev.pdev = pdev;
-diff -urNp linux-3.0.3/drivers/scsi/vmw_pvscsi.c linux-3.0.3/drivers/scsi/vmw_pvscsi.c
---- linux-3.0.3/drivers/scsi/vmw_pvscsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/vmw_pvscsi.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/vmw_pvscsi.c linux-3.0.4/drivers/scsi/vmw_pvscsi.c
+--- linux-3.0.4/drivers/scsi/vmw_pvscsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/vmw_pvscsi.c	2011-08-23 21:48:14.000000000 -0400
 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
  	dma_addr_t base;
  	unsigned i;
@@ -31846,9 +31830,9 @@ diff -urNp linux-3.0.3/drivers/scsi/vmw_pvscsi.c linux-3.0.3/drivers/scsi/vmw_pv
  	cmd.ringsStatePPN   = adapter->ringStatePA >> PAGE_SHIFT;
  	cmd.reqRingNumPages = adapter->req_pages;
  	cmd.cmpRingNumPages = adapter->cmp_pages;
-diff -urNp linux-3.0.3/drivers/spi/spi.c linux-3.0.3/drivers/spi/spi.c
---- linux-3.0.3/drivers/spi/spi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/spi/spi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/spi/spi.c linux-3.0.4/drivers/spi/spi.c
+--- linux-3.0.4/drivers/spi/spi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/spi/spi.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
@@ -31858,9 +31842,9 @@ diff -urNp linux-3.0.3/drivers/spi/spi.c linux-3.0.3/drivers/spi/spi.c
  
  static u8	*buf;
  
-diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c
---- linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:48:14.000000000 -0400
 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
          (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
  
@@ -31870,9 +31854,9 @@ diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.3/
      .ndo_init               = NULL,
      .ndo_open               = ar6000_open,
      .ndo_stop               = ar6000_close,
-diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
---- linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
  typedef struct ar6k_pal_config_s
  {
@@ -31882,9 +31866,9 @@ diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-
  
  void register_pal_cb(ar6k_pal_config_t *palConfig_p);
  #endif /* _AR6K_PAL_H_ */
-diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-08-23 21:47:56.000000000 -0400
 @@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp)
  			free_netdev(ifp->net);
  		}
@@ -31929,9 +31913,9 @@ diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.
  
  #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
  	g_bus = bus;
-diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
---- linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
+--- linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-08-23 21:47:56.000000000 -0400
 @@ -593,7 +593,7 @@ struct phy_func_ptr {
  	initfn_t carrsuppr;
  	rxsigpwrfn_t rxsigpwr;
@@ -31941,9 +31925,9 @@ diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linu
  typedef struct phy_func_ptr phy_func_ptr_t;
  
  struct phy_info {
-diff -urNp linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h
---- linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h
+--- linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h	2011-08-23 21:47:56.000000000 -0400
 @@ -185,7 +185,7 @@ typedef struct {
  			 u16 func, uint bustype, void *regsva, void *param);
  	/* detach from device */
@@ -31953,9 +31937,9 @@ diff -urNp linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.3/dr
  
  /* platform specific/high level functions */
  extern int bcmsdh_register(bcmsdh_driver_t *driver);
-diff -urNp linux-3.0.3/drivers/staging/et131x/et1310_tx.c linux-3.0.3/drivers/staging/et131x/et1310_tx.c
---- linux-3.0.3/drivers/staging/et131x/et1310_tx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/et131x/et1310_tx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/et131x/et1310_tx.c linux-3.0.4/drivers/staging/et131x/et1310_tx.c
+--- linux-3.0.4/drivers/staging/et131x/et1310_tx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/et131x/et1310_tx.c	2011-08-23 21:47:56.000000000 -0400
 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
  	struct net_device_stats *stats = &etdev->net_stats;
  
@@ -31971,9 +31955,9 @@ diff -urNp linux-3.0.3/drivers/staging/et131x/et1310_tx.c linux-3.0.3/drivers/st
  
  	if (tcb->skb) {
  		stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-3.0.3/drivers/staging/et131x/et131x_adapter.h linux-3.0.3/drivers/staging/et131x/et131x_adapter.h
---- linux-3.0.3/drivers/staging/et131x/et131x_adapter.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/et131x/et131x_adapter.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/et131x/et131x_adapter.h linux-3.0.4/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.0.4/drivers/staging/et131x/et131x_adapter.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/et131x/et131x_adapter.h	2011-08-23 21:47:56.000000000 -0400
 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
  	 * operations
  	 */
@@ -31989,9 +31973,9 @@ diff -urNp linux-3.0.3/drivers/staging/et131x/et131x_adapter.h linux-3.0.3/drive
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff -urNp linux-3.0.3/drivers/staging/hv/channel.c linux-3.0.3/drivers/staging/hv/channel.c
---- linux-3.0.3/drivers/staging/hv/channel.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/channel.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/channel.c linux-3.0.4/drivers/staging/hv/channel.c
+--- linux-3.0.4/drivers/staging/hv/channel.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/channel.c	2011-08-23 21:47:56.000000000 -0400
 @@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c
  	int ret = 0;
  	int t;
@@ -32003,9 +31987,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/channel.c linux-3.0.3/drivers/staging/
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
-diff -urNp linux-3.0.3/drivers/staging/hv/hv.c linux-3.0.3/drivers/staging/hv/hv.c
---- linux-3.0.3/drivers/staging/hv/hv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/hv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/hv.c linux-3.0.4/drivers/staging/hv/hv.c
+--- linux-3.0.4/drivers/staging/hv/hv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/hv.c	2011-08-23 21:47:56.000000000 -0400
 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
  	u64 output_address = (output) ? virt_to_phys(output) : 0;
  	u32 output_address_hi = output_address >> 32;
@@ -32015,9 +31999,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/hv.c linux-3.0.3/drivers/staging/hv/hv
  
  	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
  			      "=a"(hv_status_lo) : "d" (control_hi),
-diff -urNp linux-3.0.3/drivers/staging/hv/hv_mouse.c linux-3.0.3/drivers/staging/hv/hv_mouse.c
---- linux-3.0.3/drivers/staging/hv/hv_mouse.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/hv_mouse.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/hv_mouse.c linux-3.0.4/drivers/staging/hv/hv_mouse.c
+--- linux-3.0.4/drivers/staging/hv/hv_mouse.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/hv_mouse.c	2011-08-23 21:47:56.000000000 -0400
 @@ -879,8 +879,10 @@ static void reportdesc_callback(struct h
  	if (hid_dev) {
  		DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
@@ -32031,9 +32015,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/hv_mouse.c linux-3.0.3/drivers/staging
  
  		hid_dev->bus = BUS_VIRTUAL;
  		hid_dev->vendor = input_device_ctx->device_info.vendor;
-diff -urNp linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h
---- linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h	2011-08-23 21:47:56.000000000 -0400
 @@ -559,7 +559,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
  	enum vmbus_connect_state conn_state;
@@ -32043,9 +32027,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h linux-3.0.3/drivers/sta
  
  	/*
  	 * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-3.0.3/drivers/staging/hv/rndis_filter.c linux-3.0.3/drivers/staging/hv/rndis_filter.c
---- linux-3.0.3/drivers/staging/hv/rndis_filter.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/rndis_filter.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/staging/hv/rndis_filter.c
+--- linux-3.0.4/drivers/staging/hv/rndis_filter.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/rndis_filter.c	2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,7 @@ struct rndis_device {
  
  	enum rndis_device_state state;
@@ -32073,9 +32057,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/rndis_filter.c linux-3.0.3/drivers/sta
  
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
-diff -urNp linux-3.0.3/drivers/staging/hv/vmbus_drv.c linux-3.0.3/drivers/staging/hv/vmbus_drv.c
---- linux-3.0.3/drivers/staging/hv/vmbus_drv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/vmbus_drv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/vmbus_drv.c linux-3.0.4/drivers/staging/hv/vmbus_drv.c
+--- linux-3.0.4/drivers/staging/hv/vmbus_drv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/vmbus_drv.c	2011-08-23 21:47:56.000000000 -0400
 @@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h
  {
  	int ret = 0;
@@ -32090,9 +32074,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/vmbus_drv.c linux-3.0.3/drivers/stagin
  
  	/* The new device belongs to this bus */
  	child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
-diff -urNp linux-3.0.3/drivers/staging/iio/ring_generic.h linux-3.0.3/drivers/staging/iio/ring_generic.h
---- linux-3.0.3/drivers/staging/iio/ring_generic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/iio/ring_generic.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/iio/ring_generic.h linux-3.0.4/drivers/staging/iio/ring_generic.h
+--- linux-3.0.4/drivers/staging/iio/ring_generic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/iio/ring_generic.h	2011-08-23 21:47:56.000000000 -0400
 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
  
  	int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -32102,9 +32086,9 @@ diff -urNp linux-3.0.3/drivers/staging/iio/ring_generic.h linux-3.0.3/drivers/st
  
  struct iio_ring_setup_ops {
  	int				(*preenable)(struct iio_dev *);
-diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet.c linux-3.0.3/drivers/staging/octeon/ethernet.c
---- linux-3.0.3/drivers/staging/octeon/ethernet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/octeon/ethernet.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet.c linux-3.0.4/drivers/staging/octeon/ethernet.c
+--- linux-3.0.4/drivers/staging/octeon/ethernet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/octeon/ethernet.c	2011-08-23 21:47:56.000000000 -0400
 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
  		 * since the RX tasklet also increments it.
  		 */
@@ -32121,9 +32105,9 @@ diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet.c linux-3.0.3/drivers/sta
  #endif
  	}
  
-diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet-rx.c linux-3.0.3/drivers/staging/octeon/ethernet-rx.c
---- linux-3.0.3/drivers/staging/octeon/ethernet-rx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/octeon/ethernet-rx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.0.4/drivers/staging/octeon/ethernet-rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/octeon/ethernet-rx.c	2011-08-23 21:47:56.000000000 -0400
 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -32152,9 +32136,9 @@ diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet-rx.c linux-3.0.3/drivers/
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/inode.c linux-3.0.3/drivers/staging/pohmelfs/inode.c
---- linux-3.0.3/drivers/staging/pohmelfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/staging/pohmelfs/inode.c
+--- linux-3.0.4/drivers/staging/pohmelfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
@@ -32173,9 +32157,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/inode.c linux-3.0.3/drivers/stag
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/mcache.c linux-3.0.3/drivers/staging/pohmelfs/mcache.c
---- linux-3.0.3/drivers/staging/pohmelfs/mcache.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/mcache.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/mcache.c linux-3.0.4/drivers/staging/pohmelfs/mcache.c
+--- linux-3.0.4/drivers/staging/pohmelfs/mcache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/mcache.c	2011-08-23 21:47:56.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
@@ -32185,9 +32169,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/mcache.c linux-3.0.3/drivers/sta
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/netfs.h linux-3.0.3/drivers/staging/pohmelfs/netfs.h
---- linux-3.0.3/drivers/staging/pohmelfs/netfs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/netfs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/netfs.h linux-3.0.4/drivers/staging/pohmelfs/netfs.h
+--- linux-3.0.4/drivers/staging/pohmelfs/netfs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/netfs.h	2011-08-23 21:47:56.000000000 -0400
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
@@ -32205,9 +32189,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/netfs.h linux-3.0.3/drivers/stag
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/trans.c linux-3.0.3/drivers/staging/pohmelfs/trans.c
---- linux-3.0.3/drivers/staging/pohmelfs/trans.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/trans.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/trans.c linux-3.0.4/drivers/staging/pohmelfs/trans.c
+--- linux-3.0.4/drivers/staging/pohmelfs/trans.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/trans.c	2011-08-23 21:47:56.000000000 -0400
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
  	int err;
  	struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -32217,9 +32201,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/trans.c linux-3.0.3/drivers/stag
  
  	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
  		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h
---- linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h	2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ struct	_io_ops {
  			  u8 *pmem);
  	u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -32229,9 +32213,9 @@ diff -urNp linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.3/drivers/
  
  struct io_req {
  	struct list_head list;
-diff -urNp linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c
---- linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c	2011-08-24 18:21:41.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c	2011-08-24 18:21:41.000000000 -0400
 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
  	t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
  
@@ -32241,9 +32225,9 @@ diff -urNp linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.3/drivers/st
  			return -EFAULT;
  
  	return 0;
-diff -urNp linux-3.0.3/drivers/staging/tty/stallion.c linux-3.0.3/drivers/staging/tty/stallion.c
---- linux-3.0.3/drivers/staging/tty/stallion.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/tty/stallion.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/tty/stallion.c linux-3.0.4/drivers/staging/tty/stallion.c
+--- linux-3.0.4/drivers/staging/tty/stallion.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/tty/stallion.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
  	struct stlport	stl_dummyport;
  	struct stlport	*portp;
@@ -32253,9 +32237,9 @@ diff -urNp linux-3.0.3/drivers/staging/tty/stallion.c linux-3.0.3/drivers/stagin
  	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
  		return -EFAULT;
  	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff -urNp linux-3.0.3/drivers/staging/usbip/usbip_common.h linux-3.0.3/drivers/staging/usbip/usbip_common.h
---- linux-3.0.3/drivers/staging/usbip/usbip_common.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/usbip_common.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/usbip_common.h linux-3.0.4/drivers/staging/usbip/usbip_common.h
+--- linux-3.0.4/drivers/staging/usbip/usbip_common.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/usbip_common.h	2011-08-23 21:47:56.000000000 -0400
 @@ -315,7 +315,7 @@ struct usbip_device {
  		void (*shutdown)(struct usbip_device *);
  		void (*reset)(struct usbip_device *);
@@ -32265,9 +32249,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/usbip_common.h linux-3.0.3/drivers/
  };
  
  void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
-diff -urNp linux-3.0.3/drivers/staging/usbip/vhci.h linux-3.0.3/drivers/staging/usbip/vhci.h
---- linux-3.0.3/drivers/staging/usbip/vhci.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/vhci.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/vhci.h linux-3.0.4/drivers/staging/usbip/vhci.h
+--- linux-3.0.4/drivers/staging/usbip/vhci.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/vhci.h	2011-08-23 21:47:56.000000000 -0400
 @@ -94,7 +94,7 @@ struct vhci_hcd {
  	unsigned resuming:1;
  	unsigned long re_timeout;
@@ -32277,9 +32261,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/vhci.h linux-3.0.3/drivers/staging/
  
  	/*
  	 * NOTE:
-diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_hcd.c linux-3.0.3/drivers/staging/usbip/vhci_hcd.c
---- linux-3.0.3/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.0.4/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:47:56.000000000 -0400
 @@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb)
  		return;
  	}
@@ -32307,9 +32291,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_hcd.c linux-3.0.3/drivers/stag
  	spin_lock_init(&vhci->lock);
  
  	hcd->power_budget = 0; /* no limit */
-diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_rx.c linux-3.0.3/drivers/staging/usbip/vhci_rx.c
---- linux-3.0.3/drivers/staging/usbip/vhci_rx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/vhci_rx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_rx.c linux-3.0.4/drivers/staging/usbip/vhci_rx.c
+--- linux-3.0.4/drivers/staging/usbip/vhci_rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/vhci_rx.c	2011-08-23 21:47:56.000000000 -0400
 @@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct 
  	if (!urb) {
  		pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
@@ -32319,9 +32303,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_rx.c linux-3.0.3/drivers/stagi
  		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
  		return;
  	}
-diff -urNp linux-3.0.3/drivers/staging/vt6655/hostap.c linux-3.0.3/drivers/staging/vt6655/hostap.c
---- linux-3.0.3/drivers/staging/vt6655/hostap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/vt6655/hostap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/vt6655/hostap.c linux-3.0.4/drivers/staging/vt6655/hostap.c
+--- linux-3.0.4/drivers/staging/vt6655/hostap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/vt6655/hostap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -79,14 +79,13 @@ static int          msglevel            
   *
   */
@@ -32348,9 +32332,9 @@ diff -urNp linux-3.0.3/drivers/staging/vt6655/hostap.c linux-3.0.3/drivers/stagi
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.3/drivers/staging/vt6656/hostap.c linux-3.0.3/drivers/staging/vt6656/hostap.c
---- linux-3.0.3/drivers/staging/vt6656/hostap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/vt6656/hostap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/vt6656/hostap.c linux-3.0.4/drivers/staging/vt6656/hostap.c
+--- linux-3.0.4/drivers/staging/vt6656/hostap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/vt6656/hostap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -80,14 +80,13 @@ static int          msglevel            
   *
   */
@@ -32377,9 +32361,9 @@ diff -urNp linux-3.0.3/drivers/staging/vt6656/hostap.c linux-3.0.3/drivers/stagi
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
  
  struct usbctlx_completor {
@@ -32389,9 +32373,9 @@ diff -urNp linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.3/drivers
  
  static int
  hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.c linux-3.0.3/drivers/staging/zcache/tmem.c
---- linux-3.0.3/drivers/staging/zcache/tmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/zcache/tmem.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.c linux-3.0.4/drivers/staging/zcache/tmem.c
+--- linux-3.0.4/drivers/staging/zcache/tmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/zcache/tmem.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@
   * A tmem host implementation must use this function to register callbacks
   * for memory allocation.
@@ -32410,9 +32394,9 @@ diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.c linux-3.0.3/drivers/staging
  
  void tmem_register_pamops(struct tmem_pamops *m)
  {
-diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.h linux-3.0.3/drivers/staging/zcache/tmem.h
---- linux-3.0.3/drivers/staging/zcache/tmem.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/zcache/tmem.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.h linux-3.0.4/drivers/staging/zcache/tmem.h
+--- linux-3.0.4/drivers/staging/zcache/tmem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/zcache/tmem.h	2011-08-23 21:47:56.000000000 -0400
 @@ -171,6 +171,7 @@ struct tmem_pamops {
  	int (*get_data)(struct page *, void *, struct tmem_pool *);
  	void (*free)(void *, struct tmem_pool *);
@@ -32429,9 +32413,9 @@ diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.h linux-3.0.3/drivers/staging
  extern void tmem_register_hostops(struct tmem_hostops *m);
  
  /* core tmem accessor functions */
-diff -urNp linux-3.0.3/drivers/target/target_core_alua.c linux-3.0.3/drivers/target/target_core_alua.c
---- linux-3.0.3/drivers/target/target_core_alua.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_alua.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/target/target_core_alua.c
+--- linux-3.0.4/drivers/target/target_core_alua.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_alua.c	2011-08-23 21:48:14.000000000 -0400
 @@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_
  	char path[ALUA_METADATA_PATH_LEN];
  	int len;
@@ -32450,9 +32434,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_alua.c linux-3.0.3/drivers/tar
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  	memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff -urNp linux-3.0.3/drivers/target/target_core_cdb.c linux-3.0.3/drivers/target/target_core_cdb.c
---- linux-3.0.3/drivers/target/target_core_cdb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_cdb.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_cdb.c linux-3.0.4/drivers/target/target_core_cdb.c
+--- linux-3.0.4/drivers/target/target_core_cdb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_cdb.c	2011-08-23 21:48:14.000000000 -0400
 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
  	int length = 0;
  	unsigned char buf[SE_MODE_PAGE_BUF];
@@ -32462,9 +32446,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_cdb.c linux-3.0.3/drivers/targ
  	memset(buf, 0, SE_MODE_PAGE_BUF);
  
  	switch (cdb[2] & 0x3f) {
-diff -urNp linux-3.0.3/drivers/target/target_core_configfs.c linux-3.0.3/drivers/target/target_core_configfs.c
---- linux-3.0.3/drivers/target/target_core_configfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_configfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_configfs.c linux-3.0.4/drivers/target/target_core_configfs.c
+--- linux-3.0.4/drivers/target/target_core_configfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_configfs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a
  	ssize_t len = 0;
  	int reg_count = 0, prf_isid;
@@ -32474,9 +32458,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_configfs.c linux-3.0.3/drivers
  	if (!(su_dev->se_dev_ptr))
  		return -ENODEV;
  
-diff -urNp linux-3.0.3/drivers/target/target_core_pr.c linux-3.0.3/drivers/target/target_core_pr.c
---- linux-3.0.3/drivers/target/target_core_pr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_pr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/target/target_core_pr.c
+--- linux-3.0.4/drivers/target/target_core_pr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_pr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
  	unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
  	u16 tpgt;
@@ -32504,9 +32488,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_pr.c linux-3.0.3/drivers/targe
  	memset(iov, 0, sizeof(struct iovec));
  	memset(path, 0, 512);
  
-diff -urNp linux-3.0.3/drivers/target/target_core_tmr.c linux-3.0.3/drivers/target/target_core_tmr.c
---- linux-3.0.3/drivers/target/target_core_tmr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_tmr.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_tmr.c linux-3.0.4/drivers/target/target_core_tmr.c
+--- linux-3.0.4/drivers/target/target_core_tmr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_tmr.c	2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ int core_tmr_lun_reset(
  			CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
  			T_TASK(cmd)->t_task_cdbs,
@@ -32534,9 +32518,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_tmr.c linux-3.0.3/drivers/targ
  		spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
  		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
-diff -urNp linux-3.0.3/drivers/target/target_core_transport.c linux-3.0.3/drivers/target/target_core_transport.c
---- linux-3.0.3/drivers/target/target_core_transport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_transport.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_transport.c linux-3.0.4/drivers/target/target_core_transport.c
+--- linux-3.0.4/drivers/target/target_core_transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_transport.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
  
  	dev->queue_depth	= dev_limits->queue_depth;
@@ -32612,9 +32596,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_transport.c linux-3.0.3/driver
  			atomic_read(&T_TASK(cmd)->t_transport_active),
  			atomic_read(&T_TASK(cmd)->t_transport_stop),
  			atomic_read(&T_TASK(cmd)->t_transport_sent));
-diff -urNp linux-3.0.3/drivers/telephony/ixj.c linux-3.0.3/drivers/telephony/ixj.c
---- linux-3.0.3/drivers/telephony/ixj.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/telephony/ixj.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/telephony/ixj.c linux-3.0.4/drivers/telephony/ixj.c
+--- linux-3.0.4/drivers/telephony/ixj.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/telephony/ixj.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
  	bool mContinue;
  	char *pIn, *pOut;
@@ -32624,9 +32608,9 @@ diff -urNp linux-3.0.3/drivers/telephony/ixj.c linux-3.0.3/drivers/telephony/ixj
  	if (!SCI_Prepare(j))
  		return 0;
  
-diff -urNp linux-3.0.3/drivers/tty/hvc/hvcs.c linux-3.0.3/drivers/tty/hvc/hvcs.c
---- linux-3.0.3/drivers/tty/hvc/hvcs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/hvc/hvcs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/hvc/hvcs.c linux-3.0.4/drivers/tty/hvc/hvcs.c
+--- linux-3.0.4/drivers/tty/hvc/hvcs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/hvc/hvcs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -32729,9 +32713,9 @@ diff -urNp linux-3.0.3/drivers/tty/hvc/hvcs.c linux-3.0.3/drivers/tty/hvc/hvcs.c
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-3.0.3/drivers/tty/ipwireless/tty.c linux-3.0.3/drivers/tty/ipwireless/tty.c
---- linux-3.0.3/drivers/tty/ipwireless/tty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/ipwireless/tty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/ipwireless/tty.c linux-3.0.4/drivers/tty/ipwireless/tty.c
+--- linux-3.0.4/drivers/tty/ipwireless/tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/ipwireless/tty.c	2011-08-23 21:47:56.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -32854,9 +32838,9 @@ diff -urNp linux-3.0.3/drivers/tty/ipwireless/tty.c linux-3.0.3/drivers/tty/ipwi
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-3.0.3/drivers/tty/n_gsm.c linux-3.0.3/drivers/tty/n_gsm.c
---- linux-3.0.3/drivers/tty/n_gsm.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/tty/n_gsm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/n_gsm.c linux-3.0.4/drivers/tty/n_gsm.c
+--- linux-3.0.4/drivers/tty/n_gsm.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/tty/n_gsm.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
  		return NULL;
  	spin_lock_init(&dlci->lock);
@@ -32866,9 +32850,9 @@ diff -urNp linux-3.0.3/drivers/tty/n_gsm.c linux-3.0.3/drivers/tty/n_gsm.c
  		kfree(dlci);
  		return NULL;
  	}
-diff -urNp linux-3.0.3/drivers/tty/n_tty.c linux-3.0.3/drivers/tty/n_tty.c
---- linux-3.0.3/drivers/tty/n_tty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/n_tty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/n_tty.c linux-3.0.4/drivers/tty/n_tty.c
+--- linux-3.0.4/drivers/tty/n_tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/n_tty.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
  	*ops = tty_ldisc_N_TTY;
@@ -32878,9 +32862,9 @@ diff -urNp linux-3.0.3/drivers/tty/n_tty.c linux-3.0.3/drivers/tty/n_tty.c
 +	ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-3.0.3/drivers/tty/pty.c linux-3.0.3/drivers/tty/pty.c
---- linux-3.0.3/drivers/tty/pty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/pty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/pty.c linux-3.0.4/drivers/tty/pty.c
+--- linux-3.0.4/drivers/tty/pty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/pty.c	2011-08-23 21:47:56.000000000 -0400
 @@ -754,8 +754,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
@@ -32893,9 +32877,9 @@ diff -urNp linux-3.0.3/drivers/tty/pty.c linux-3.0.3/drivers/tty/pty.c
  
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-diff -urNp linux-3.0.3/drivers/tty/rocket.c linux-3.0.3/drivers/tty/rocket.c
---- linux-3.0.3/drivers/tty/rocket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/rocket.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/rocket.c linux-3.0.4/drivers/tty/rocket.c
+--- linux-3.0.4/drivers/tty/rocket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/rocket.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
  	struct rocket_ports tmp;
  	int board;
@@ -32905,9 +32889,9 @@ diff -urNp linux-3.0.3/drivers/tty/rocket.c linux-3.0.3/drivers/tty/rocket.c
  	if (!retports)
  		return -EFAULT;
  	memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-3.0.3/drivers/tty/serial/kgdboc.c linux-3.0.3/drivers/tty/serial/kgdboc.c
---- linux-3.0.3/drivers/tty/serial/kgdboc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/serial/kgdboc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/serial/kgdboc.c linux-3.0.4/drivers/tty/serial/kgdboc.c
+--- linux-3.0.4/drivers/tty/serial/kgdboc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/serial/kgdboc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -23,8 +23,9 @@
  #define MAX_CONFIG_LEN		40
  
@@ -33006,9 +32990,9 @@ diff -urNp linux-3.0.3/drivers/tty/serial/kgdboc.c linux-3.0.3/drivers/tty/seria
  #ifdef CONFIG_KGDB_SERIAL_CONSOLE
  /* This is only available if kgdboc is a built in for early debugging */
  static int __init kgdboc_early_init(char *opt)
-diff -urNp linux-3.0.3/drivers/tty/serial/mrst_max3110.c linux-3.0.3/drivers/tty/serial/mrst_max3110.c
---- linux-3.0.3/drivers/tty/serial/mrst_max3110.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/serial/mrst_max3110.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/serial/mrst_max3110.c linux-3.0.4/drivers/tty/serial/mrst_max3110.c
+--- linux-3.0.4/drivers/tty/serial/mrst_max3110.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/serial/mrst_max3110.c	2011-08-23 21:48:14.000000000 -0400
 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
  	int loop = 1, num, total = 0;
  	u8 recv_buf[512], *pbuf;
@@ -33018,9 +33002,9 @@ diff -urNp linux-3.0.3/drivers/tty/serial/mrst_max3110.c linux-3.0.3/drivers/tty
  	pbuf = recv_buf;
  	do {
  		num = max3110_read_multi(max, pbuf);
-diff -urNp linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3/drivers/tty/tty_io.c
---- linux-3.0.3/drivers/tty/tty_io.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/tty_io.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4/drivers/tty/tty_io.c
+--- linux-3.0.4/drivers/tty/tty_io.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/tty_io.c	2011-08-23 21:47:56.000000000 -0400
 @@ -3215,7 +3215,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
  void tty_default_fops(struct file_operations *fops)
@@ -33030,9 +33014,9 @@ diff -urNp linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3/drivers/tty/tty_io.c
  }
  
  /*
-diff -urNp linux-3.0.3/drivers/tty/tty_ldisc.c linux-3.0.3/drivers/tty/tty_ldisc.c
---- linux-3.0.3/drivers/tty/tty_ldisc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/tty_ldisc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/tty_ldisc.c linux-3.0.4/drivers/tty/tty_ldisc.c
+--- linux-3.0.4/drivers/tty/tty_ldisc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/tty_ldisc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
  	if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
  		struct tty_ldisc_ops *ldo = ld->ops;
@@ -33078,9 +33062,9 @@ diff -urNp linux-3.0.3/drivers/tty/tty_ldisc.c linux-3.0.3/drivers/tty/tty_ldisc
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-3.0.3/drivers/tty/vt/keyboard.c linux-3.0.3/drivers/tty/vt/keyboard.c
---- linux-3.0.3/drivers/tty/vt/keyboard.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/vt/keyboard.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/vt/keyboard.c linux-3.0.4/drivers/tty/vt/keyboard.c
+--- linux-3.0.4/drivers/tty/vt/keyboard.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/vt/keyboard.c	2011-08-23 21:48:14.000000000 -0400
 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
  	     kbd->kbdmode == VC_OFF) &&
  	     value != KVAL(K_SAK))
@@ -33098,9 +33082,9 @@ diff -urNp linux-3.0.3/drivers/tty/vt/keyboard.c linux-3.0.3/drivers/tty/vt/keyb
  	fn_handler[value](vc);
  }
  
-diff -urNp linux-3.0.3/drivers/tty/vt/vt.c linux-3.0.3/drivers/tty/vt/vt.c
---- linux-3.0.3/drivers/tty/vt/vt.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/vt/vt.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/vt/vt.c linux-3.0.4/drivers/tty/vt/vt.c
+--- linux-3.0.4/drivers/tty/vt/vt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/vt/vt.c	2011-08-23 21:47:56.000000000 -0400
 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -33110,9 +33094,9 @@ diff -urNp linux-3.0.3/drivers/tty/vt/vt.c linux-3.0.3/drivers/tty/vt/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-3.0.3/drivers/tty/vt/vt_ioctl.c linux-3.0.3/drivers/tty/vt/vt_ioctl.c
---- linux-3.0.3/drivers/tty/vt/vt_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/vt/vt_ioctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/vt/vt_ioctl.c linux-3.0.4/drivers/tty/vt/vt_ioctl.c
+--- linux-3.0.4/drivers/tty/vt/vt_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/vt/vt_ioctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
@@ -33153,9 +33137,9 @@ diff -urNp linux-3.0.3/drivers/tty/vt/vt_ioctl.c linux-3.0.3/drivers/tty/vt/vt_i
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-3.0.3/drivers/uio/uio.c linux-3.0.3/drivers/uio/uio.c
---- linux-3.0.3/drivers/uio/uio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/uio/uio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/uio/uio.c linux-3.0.4/drivers/uio/uio.c
+--- linux-3.0.4/drivers/uio/uio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/uio/uio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -33247,9 +33231,9 @@ diff -urNp linux-3.0.3/drivers/uio/uio.c linux-3.0.3/drivers/uio/uio.c
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff -urNp linux-3.0.3/drivers/usb/atm/cxacru.c linux-3.0.3/drivers/usb/atm/cxacru.c
---- linux-3.0.3/drivers/usb/atm/cxacru.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/atm/cxacru.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/atm/cxacru.c linux-3.0.4/drivers/usb/atm/cxacru.c
+--- linux-3.0.4/drivers/usb/atm/cxacru.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/atm/cxacru.c	2011-08-23 21:47:56.000000000 -0400
 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
  		ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
  		if (ret < 2)
@@ -33259,9 +33243,9 @@ diff -urNp linux-3.0.3/drivers/usb/atm/cxacru.c linux-3.0.3/drivers/usb/atm/cxac
  			return -EINVAL;
  		pos += tmp;
  
-diff -urNp linux-3.0.3/drivers/usb/atm/usbatm.c linux-3.0.3/drivers/usb/atm/usbatm.c
---- linux-3.0.3/drivers/usb/atm/usbatm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/atm/usbatm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usbatm.c
+--- linux-3.0.4/drivers/usb/atm/usbatm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/atm/usbatm.c	2011-08-23 21:47:56.000000000 -0400
 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
  		if (printk_ratelimit())
  			atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -33341,9 +33325,9 @@ diff -urNp linux-3.0.3/drivers/usb/atm/usbatm.c linux-3.0.3/drivers/usb/atm/usba
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-3.0.3/drivers/usb/core/devices.c linux-3.0.3/drivers/usb/core/devices.c
---- linux-3.0.3/drivers/usb/core/devices.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/core/devices.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/core/devices.c linux-3.0.4/drivers/usb/core/devices.c
+--- linux-3.0.4/drivers/usb/core/devices.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/core/devices.c	2011-08-23 21:47:56.000000000 -0400
 @@ -126,7 +126,7 @@ static const char format_endpt[] =
   * time it gets called.
   */
@@ -33371,9 +33355,9 @@ diff -urNp linux-3.0.3/drivers/usb/core/devices.c linux-3.0.3/drivers/usb/core/d
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
-diff -urNp linux-3.0.3/drivers/usb/core/message.c linux-3.0.3/drivers/usb/core/message.c
---- linux-3.0.3/drivers/usb/core/message.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/core/message.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/core/message.c linux-3.0.4/drivers/usb/core/message.c
+--- linux-3.0.4/drivers/usb/core/message.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/core/message.c	2011-08-23 21:47:56.000000000 -0400
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
@@ -33385,9 +33369,9 @@ diff -urNp linux-3.0.3/drivers/usb/core/message.c linux-3.0.3/drivers/usb/core/m
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-3.0.3/drivers/usb/early/ehci-dbgp.c linux-3.0.3/drivers/usb/early/ehci-dbgp.c
---- linux-3.0.3/drivers/usb/early/ehci-dbgp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/early/ehci-dbgp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/early/ehci-dbgp.c linux-3.0.4/drivers/usb/early/ehci-dbgp.c
+--- linux-3.0.4/drivers/usb/early/ehci-dbgp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/early/ehci-dbgp.c	2011-08-23 21:47:56.000000000 -0400
 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
  
  #ifdef CONFIG_KGDB
@@ -33425,9 +33409,9 @@ diff -urNp linux-3.0.3/drivers/usb/early/ehci-dbgp.c linux-3.0.3/drivers/usb/ear
  
  	return 0;
  }
-diff -urNp linux-3.0.3/drivers/usb/host/xhci-mem.c linux-3.0.3/drivers/usb/host/xhci-mem.c
---- linux-3.0.3/drivers/usb/host/xhci-mem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/host/xhci-mem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/host/xhci-mem.c linux-3.0.4/drivers/usb/host/xhci-mem.c
+--- linux-3.0.4/drivers/usb/host/xhci-mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/host/xhci-mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str
  	unsigned int num_tests;
  	int i, ret;
@@ -33437,9 +33421,9 @@ diff -urNp linux-3.0.3/drivers/usb/host/xhci-mem.c linux-3.0.3/drivers/usb/host/
  	num_tests = ARRAY_SIZE(simple_test_vector);
  	for (i = 0; i < num_tests; i++) {
  		ret = xhci_test_trb_in_td(xhci,
-diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-hc.h linux-3.0.3/drivers/usb/wusbcore/wa-hc.h
---- linux-3.0.3/drivers/usb/wusbcore/wa-hc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/wusbcore/wa-hc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-hc.h linux-3.0.4/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.0.4/drivers/usb/wusbcore/wa-hc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/wusbcore/wa-hc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -192,7 +192,7 @@ struct wahc {
  	struct list_head xfer_delayed_list;
  	spinlock_t xfer_list_lock;
@@ -33458,9 +33442,9 @@ diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-hc.h linux-3.0.3/drivers/usb/wusb
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c
---- linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c	2011-08-23 21:47:56.000000000 -0400
 @@ -294,7 +294,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -33470,9 +33454,9 @@ diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c linux-3.0.3/drivers/usb/wu
  }
  
  /*
-diff -urNp linux-3.0.3/drivers/vhost/vhost.c linux-3.0.3/drivers/vhost/vhost.c
---- linux-3.0.3/drivers/vhost/vhost.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/vhost/vhost.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/vhost/vhost.c linux-3.0.4/drivers/vhost/vhost.c
+--- linux-3.0.4/drivers/vhost/vhost.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/vhost/vhost.c	2011-08-23 21:47:56.000000000 -0400
 @@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu
  	return get_user(vq->last_used_idx, &used->idx);
  }
@@ -33482,9 +33466,9 @@ diff -urNp linux-3.0.3/drivers/vhost/vhost.c linux-3.0.3/drivers/vhost/vhost.c
  {
  	struct file *eventfp, *filep = NULL,
  		    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-3.0.3/drivers/video/fbcmap.c linux-3.0.3/drivers/video/fbcmap.c
---- linux-3.0.3/drivers/video/fbcmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/fbcmap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/fbcmap.c linux-3.0.4/drivers/video/fbcmap.c
+--- linux-3.0.4/drivers/video/fbcmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/fbcmap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
@@ -33495,9 +33479,9 @@ diff -urNp linux-3.0.3/drivers/video/fbcmap.c linux-3.0.3/drivers/video/fbcmap.c
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-3.0.3/drivers/video/fbmem.c linux-3.0.3/drivers/video/fbmem.c
---- linux-3.0.3/drivers/video/fbmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/fbmem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/fbmem.c linux-3.0.4/drivers/video/fbmem.c
+--- linux-3.0.4/drivers/video/fbmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/fbmem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
@@ -33543,9 +33527,9 @@ diff -urNp linux-3.0.3/drivers/video/fbmem.c linux-3.0.3/drivers/video/fbmem.c
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-3.0.3/drivers/video/i810/i810_accel.c linux-3.0.3/drivers/video/i810/i810_accel.c
---- linux-3.0.3/drivers/video/i810/i810_accel.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/i810/i810_accel.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/i810/i810_accel.c linux-3.0.4/drivers/video/i810/i810_accel.c
+--- linux-3.0.4/drivers/video/i810/i810_accel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/i810/i810_accel.c	2011-08-23 21:47:56.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
@@ -33554,9 +33538,2737 @@ diff -urNp linux-3.0.3/drivers/video/i810/i810_accel.c linux-3.0.3/drivers/video
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-3.0.3/drivers/video/udlfb.c linux-3.0.3/drivers/video/udlfb.c
---- linux-3.0.3/drivers/video/udlfb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/udlfb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm	2011-08-29 23:49:40.000000000 -0400
+@@ -1,1604 +1,1123 @@
+ P3
+-# Standard 224-color Linux logo
+ 80 80
+ 255
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6   6   6   6  10  10  10  10  10  10
+- 10  10  10   6   6   6   6   6   6   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  10  10  10  14  14  14
+- 22  22  22  26  26  26  30  30  30  34  34  34
+- 30  30  30  30  30  30  26  26  26  18  18  18
+- 14  14  14  10  10  10   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  26  26  26  42  42  42
+- 54  54  54  66  66  66  78  78  78  78  78  78
+- 78  78  78  74  74  74  66  66  66  54  54  54
+- 42  42  42  26  26  26  18  18  18  10  10  10
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 22  22  22  42  42  42  66  66  66  86  86  86
+- 66  66  66  38  38  38  38  38  38  22  22  22
+- 26  26  26  34  34  34  54  54  54  66  66  66
+- 86  86  86  70  70  70  46  46  46  26  26  26
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  26  26  26
+- 50  50  50  82  82  82  58  58  58   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  54  54  54  86  86  86  66  66  66
+- 38  38  38  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  22  22  22  50  50  50
+- 78  78  78  34  34  34   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   6   6   6  70  70  70
+- 78  78  78  46  46  46  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  42  42  42  82  82  82
+- 26  26  26   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  14  14  14
+- 46  46  46  34  34  34   6   6   6   2   2   6
+- 42  42  42  78  78  78  42  42  42  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  30  30  30  66  66  66  58  58  58
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  26  26  26
+- 86  86  86 101 101 101  46  46  46  10  10  10
+-  2   2   6  58  58  58  70  70  70  34  34  34
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  42  42  42  86  86  86  10  10  10
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  30  30  30
+- 94  94  94  94  94  94  58  58  58  26  26  26
+-  2   2   6   6   6   6  78  78  78  54  54  54
+- 22  22  22   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  62  62  62  62  62  62   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  26  26  26
+- 54  54  54  38  38  38  18  18  18  10  10  10
+-  2   2   6   2   2   6  34  34  34  82  82  82
+- 38  38  38  14  14  14   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 30  30  30  78  78  78  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 10  10  10   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  78  78  78
+- 50  50  50  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  14  14  14   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  54  54  54
+- 66  66  66  26  26  26   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  82  82  82   2   2   6   2   2   6
+-  2   2   6   6   6   6  10  10  10   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 14  14  14  10  10  10   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  18  18  18
+- 82  82  82  34  34  34  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6   2   2   6
+-  6   6   6   6   6   6  22  22  22  34  34  34
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  34  34  34
+- 10  10  10  50  50  50  22  22  22   2   2   6
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 86  86  86  42  42  42  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6   2   2   6
+- 38  38  38 116 116 116  94  94  94  22  22  22
+- 22  22  22   2   2   6   2   2   6   2   2   6
+- 14  14  14  86  86  86 138 138 138 162 162 162
+-154 154 154  38  38  38  26  26  26   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 86  86  86  46  46  46  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6  14  14  14
+-134 134 134 198 198 198 195 195 195 116 116 116
+- 10  10  10   2   2   6   2   2   6   6   6   6
+-101  98  89 187 187 187 210 210 210 218 218 218
+-214 214 214 134 134 134  14  14  14   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 86  86  86  50  50  50  18  18  18   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6  54  54  54
+-218 218 218 195 195 195 226 226 226 246 246 246
+- 58  58  58   2   2   6   2   2   6  30  30  30
+-210 210 210 253 253 253 174 174 174 123 123 123
+-221 221 221 234 234 234  74  74  74   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  82  82  82   2   2   6 106 106 106
+-170 170 170  26  26  26  86  86  86 226 226 226
+-123 123 123  10  10  10  14  14  14  46  46  46
+-231 231 231 190 190 190   6   6   6  70  70  70
+- 90  90  90 238 238 238 158 158 158   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  86  86  86   6   6   6 116 116 116
+-106 106 106   6   6   6  70  70  70 149 149 149
+-128 128 128  18  18  18  38  38  38  54  54  54
+-221 221 221 106 106 106   2   2   6  14  14  14
+- 46  46  46 190 190 190 198 198 198   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  62  62  62  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  94  94  94  14  14  14 101 101 101
+-128 128 128   2   2   6  18  18  18 116 116 116
+-118  98  46 121  92   8 121  92   8  98  78  10
+-162 162 162 106 106 106   2   2   6   2   2   6
+-  2   2   6 195 195 195 195 195 195   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  62  62  62  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   1
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  90  90  90  14  14  14  58  58  58
+-210 210 210  26  26  26  54  38   6 154 114  10
+-226 170  11 236 186  11 225 175  15 184 144  12
+-215 174  15 175 146  61  37  26   9   2   2   6
+- 70  70  70 246 246 246 138 138 138   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  66  66  66  26  26  26   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  14  14  14  10  10  10
+-195 195 195 188 164 115 192 133   9 225 175  15
+-239 182  13 234 190  10 232 195  16 232 200  30
+-245 207  45 241 208  19 232 195  16 184 144  12
+-218 194 134 211 206 186  42  42  42   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 50  50  50  74  74  74  30  30  30   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  86  86  86  14  14  14   2   2   6
+-121  87  25 192 133   9 219 162  10 239 182  13
+-236 186  11 232 195  16 241 208  19 244 214  54
+-246 218  60 246 218  38 246 215  20 241 208  19
+-241 208  19 226 184  13 121  87  25   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 50  50  50  82  82  82  34  34  34  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  82  82  82  30  30  30  61  42   6
+-180 123   7 206 145  10 230 174  11 239 182  13
+-234 190  10 238 202  15 241 208  19 246 218  74
+-246 218  38 246 215  20 246 215  20 246 215  20
+-226 184  13 215 174  15 184 144  12   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 26  26  26  94  94  94  42  42  42  14  14  14
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78  50  50  50 104  69   6
+-192 133   9 216 158  10 236 178  12 236 186  11
+-232 195  16 241 208  19 244 214  54 245 215  43
+-246 215  20 246 215  20 241 208  19 198 155  10
+-200 144  11 216 158  10 156 118  10   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  90  90  90  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78  46  46  46  22  22  22
+-137  92   6 210 162  10 239 182  13 238 190  10
+-238 202  15 241 208  19 246 215  20 246 215  20
+-241 208  19 203 166  17 185 133  11 210 150  10
+-216 158  10 210 150  10 102  78  10   2   2   6
+-  6   6   6  54  54  54  14  14  14   2   2   6
+-  2   2   6  62  62  62  74  74  74  30  30  30
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  78  78  78  50  50  50   6   6   6
+- 94  70  30 139 102  15 190 146  13 226 184  13
+-232 200  30 232 195  16 215 174  15 190 146  13
+-168 122  10 192 133   9 210 150  10 213 154  11
+-202 150  34 182 157 106 101  98  89   2   2   6
+-  2   2   6  78  78  78 116 116 116  58  58  58
+-  2   2   6  22  22  22  90  90  90  46  46  46
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  50  50  50   6   6   6
+-128 128 128 174 154 114 156 107  11 168 122  10
+-198 155  10 184 144  12 197 138  11 200 144  11
+-206 145  10 206 145  10 197 138  11 188 164 115
+-195 195 195 198 198 198 174 174 174  14  14  14
+-  2   2   6  22  22  22 116 116 116 116 116 116
+- 22  22  22   2   2   6  74  74  74  70  70  70
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 101 101 101  26  26  26  10  10  10
+-138 138 138 190 190 190 174 154 114 156 107  11
+-197 138  11 200 144  11 197 138  11 192 133   9
+-180 123   7 190 142  34 190 178 144 187 187 187
+-202 202 202 221 221 221 214 214 214  66  66  66
+-  2   2   6   2   2   6  50  50  50  62  62  62
+-  6   6   6   2   2   6  10  10  10  90  90  90
+- 50  50  50  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  34  34  34
+- 74  74  74  74  74  74   2   2   6   6   6   6
+-144 144 144 198 198 198 190 190 190 178 166 146
+-154 121  60 156 107  11 156 107  11 168 124  44
+-174 154 114 187 187 187 190 190 190 210 210 210
+-246 246 246 253 253 253 253 253 253 182 182 182
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  62  62  62
+- 74  74  74  34  34  34  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0  10  10  10  22  22  22  54  54  54
+- 94  94  94  18  18  18   2   2   6  46  46  46
+-234 234 234 221 221 221 190 190 190 190 190 190
+-190 190 190 187 187 187 187 187 187 190 190 190
+-190 190 190 195 195 195 214 214 214 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+- 82  82  82   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  14  14  14
+- 86  86  86  54  54  54  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  46  46  46  90  90  90
+- 46  46  46  18  18  18   6   6   6 182 182 182
+-253 253 253 246 246 246 206 206 206 190 190 190
+-190 190 190 190 190 190 190 190 190 190 190 190
+-206 206 206 231 231 231 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-202 202 202  14  14  14   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 42  42  42  86  86  86  42  42  42  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 14  14  14  38  38  38  74  74  74  66  66  66
+-  2   2   6   6   6   6  90  90  90 250 250 250
+-253 253 253 253 253 253 238 238 238 198 198 198
+-190 190 190 190 190 190 195 195 195 221 221 221
+-246 246 246 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253  82  82  82   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  78  78  78  70  70  70  34  34  34
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 34  34  34  66  66  66  78  78  78   6   6   6
+-  2   2   6  18  18  18 218 218 218 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-226 226 226 231 231 231 246 246 246 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 178 178 178   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  18  18  18  90  90  90  62  62  62
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  26  26  26
+- 58  58  58  90  90  90  18  18  18   2   2   6
+-  2   2   6 110 110 110 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 231 231 231  18  18  18   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  94  94  94
+- 54  54  54  26  26  26  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  22  22  22  50  50  50
+- 90  90  90  26  26  26   2   2   6   2   2   6
+- 14  14  14 195 195 195 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 242 242 242  54  54  54   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+- 86  86  86  50  50  50  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  38  38  38  82  82  82
+- 34  34  34   2   2   6   2   2   6   2   2   6
+- 42  42  42 195 195 195 246 246 246 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 242 242 242 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 246 246 246 238 238 238
+-226 226 226 231 231 231 101 101 101   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 38  38  38  82  82  82  42  42  42  14  14  14
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  26  26  26  62  62  62  66  66  66
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 70  70  70 170 170 170 206 206 206 234 234 234
+-246 246 246 250 250 250 250 250 250 238 238 238
+-226 226 226 231 231 231 238 238 238 250 250 250
+-250 250 250 250 250 250 246 246 246 231 231 231
+-214 214 214 206 206 206 202 202 202 202 202 202
+-198 198 198 202 202 202 182 182 182  18  18  18
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  62  62  62  66  66  66  30  30  30
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  42  42  42  82  82  82  18  18  18
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 94  94  94 182 182 182 218 218 218 242 242 242
+-250 250 250 253 253 253 253 253 253 250 250 250
+-234 234 234 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-238 238 238 226 226 226 210 210 210 202 202 202
+-195 195 195 195 195 195 210 210 210 158 158 158
+-  6   6   6  14  14  14  50  50  50  14  14  14
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  86  86  86  46  46  46
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  54  54  54  70  70  70   2   2   6
+-  2   2   6  10  10  10   2   2   6  22  22  22
+-166 166 166 231 231 231 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-231 231 231 206 206 206 198 198 198 226 226 226
+- 94  94  94   2   2   6   6   6   6  38  38  38
+- 30  30  30   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  62  62  62  66  66  66
+- 26  26  26  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  74  74  74  50  50  50   2   2   6
+- 26  26  26  26  26  26   2   2   6 106 106 106
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 246 246 246 218 218 218 202 202 202
+-210 210 210  14  14  14   2   2   6   2   2   6
+- 30  30  30  22  22  22   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  86  86  86
+- 42  42  42  14  14  14   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  90  90  90  22  22  22   2   2   6
+- 42  42  42   2   2   6  18  18  18 218 218 218
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 250 250 250 221 221 221
+-218 218 218 101 101 101   2   2   6  14  14  14
+- 18  18  18  38  38  38  10  10  10   2   2   6
+-  2   2   6   2   2   6   2   2   6  78  78  78
+- 58  58  58  22  22  22   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 54  54  54  82  82  82   2   2   6  26  26  26
+- 22  22  22   2   2   6 123 123 123 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-238 238 238 198 198 198   6   6   6  38  38  38
+- 58  58  58  26  26  26  38  38  38   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+- 78  78  78  30  30  30  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  30  30  30
+- 74  74  74  58  58  58   2   2   6  42  42  42
+-  2   2   6  22  22  22 231 231 231 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 246 246 246  46  46  46  38  38  38
+- 42  42  42  14  14  14  38  38  38  14  14  14
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 86  86  86  46  46  46  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  42  42  42
+- 90  90  90  18  18  18  18  18  18  26  26  26
+-  2   2   6 116 116 116 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 250 250 250 238 238 238
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253  94  94  94   6   6   6
+-  2   2   6   2   2   6  10  10  10  34  34  34
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0  10  10  10  26  26  26  66  66  66
+- 82  82  82   2   2   6  38  38  38   6   6   6
+- 14  14  14 210 210 210 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 246 246 246 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 144 144 144   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 42  42  42  74  74  74  30  30  30  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  42  42  42  90  90  90
+- 26  26  26   6   6   6  42  42  42   2   2   6
+- 74  74  74 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 242 242 242 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 182 182 182   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 10  10  10  86  86  86  38  38  38  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  26  26  26  66  66  66  82  82  82
+-  2   2   6  22  22  22  18  18  18   2   2   6
+-149 149 149 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 206 206 206   2   2   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  86  86  86  46  46  46  14  14  14
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 18  18  18  46  46  46  86  86  86  18  18  18
+-  2   2   6  34  34  34  10  10  10   6   6   6
+-210 210 210 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 221 221 221   6   6   6
+-  2   2   6   2   2   6   6   6   6  30  30  30
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  82  82  82  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 26  26  26  66  66  66  62  62  62   2   2   6
+-  2   2   6  38  38  38  10  10  10  26  26  26
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 238 238 238
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231   6   6   6
+-  2   2   6   2   2   6  10  10  10  30  30  30
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  58  58  58  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  78  78  78   6   6   6   2   2   6
+-  2   2   6  46  46  46  14  14  14  42  42  42
+-246 246 246 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234  10  10  10
+-  2   2   6   2   2   6  22  22  22  14  14  14
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  62  62  62  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50  74  74  74   2   2   6   2   2   6
+- 14  14  14  70  70  70  34  34  34  62  62  62
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234  14  14  14
+-  2   2   6   2   2   6  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  62  62  62  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 54  54  54  62  62  62   2   2   6   2   2   6
+-  2   2   6  30  30  30  46  46  46  70  70  70
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 226 226 226  10  10  10
+-  2   2   6   6   6   6  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  58  58  58  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 58  58  58  62  62  62   2   2   6   2   2   6
+-  2   2   6   2   2   6  30  30  30  78  78  78
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 206 206 206   2   2   6
+- 22  22  22  34  34  34  18  14   6  22  22  22
+- 26  26  26  18  18  18   6   6   6   2   2   6
+-  2   2   6  82  82  82  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  26  26  26
+- 62  62  62 106 106 106  74  54  14 185 133  11
+-210 162  10 121  92   8   6   6   6  62  62  62
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 158 158 158  18  18  18
+- 14  14  14   2   2   6   2   2   6   2   2   6
+-  6   6   6  18  18  18  66  66  66  38  38  38
+-  6   6   6  94  94  94  50  50  50  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 10  10  10  10  10  10  18  18  18  38  38  38
+- 78  78  78 142 134 106 216 158  10 242 186  14
+-246 190  14 246 190  14 156 118  10  10  10  10
+- 90  90  90 238 238 238 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 230 190
+-238 204  91 238 204  91 181 142  44  37  26   9
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  38  38  38  46  46  46
+- 26  26  26 106 106 106  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  22  22  22
+- 30  30  30  38  38  38  50  50  50  70  70  70
+-106 106 106 190 142  34 226 170  11 242 186  14
+-246 190  14 246 190  14 246 190  14 154 114  10
+-  6   6   6  74  74  74 226 226 226 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 228 184  62
+-241 196  14 241 208  19 232 195  16  38  30  10
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  30  30  30  26  26  26
+-203 166  17 154 142  90  66  66  66  26  26  26
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  38  38  38  58  58  58
+- 78  78  78  86  86  86 101 101 101 123 123 123
+-175 146  61 210 150  10 234 174  13 246 186  14
+-246 190  14 246 190  14 246 190  14 238 190  10
+-102  78  10   2   2   6  46  46  46 198 198 198
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 224 178  62
+-242 186  14 241 196  14 210 166  10  22  18   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   6   6   6 121  92   8
+-238 202  15 232 195  16  82  82  82  34  34  34
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  38  38  38  70  70  70 154 122  46
+-190 142  34 200 144  11 197 138  11 197 138  11
+-213 154  11 226 170  11 242 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-225 175  15  46  32   6   2   2   6  22  22  22
+-158 158 158 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 242 242 242 224 178  62
+-239 182  13 236 186  11 213 154  11  46  32   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  61  42   6 225 175  15
+-238 190  10 236 186  11 112 100  78  42  42  42
+- 14  14  14   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  54  54  54 154 122  46 213 154  11
+-226 170  11 230 174  11 226 170  11 226 170  11
+-236 178  12 242 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-241 196  14 184 144  12  10  10  10   2   2   6
+-  6   6   6 116 116 116 242 242 242 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 231 231 231 198 198 198 214 170  54
+-236 178  12 236 178  12 210 150  10 137  92   6
+- 18  14   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  70  47   6 200 144  11 236 178  12
+-239 182  13 239 182  13 124 112  88  58  58  58
+- 22  22  22   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  70  70  70 180 133  36 226 170  11
+-239 182  13 242 186  14 242 186  14 246 186  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 232 195  16  98  70   6   2   2   6
+-  2   2   6   2   2   6  66  66  66 221 221 221
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 206 206 206 198 198 198 214 166  58
+-230 174  11 230 174  11 216 158  10 192 133   9
+-163 110   8 116  81   8 102  78  10 116  81   8
+-167 114   7 197 138  11 226 170  11 239 182  13
+-242 186  14 242 186  14 162 146  94  78  78  78
+- 34  34  34  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 30  30  30  78  78  78 190 142  34 226 170  11
+-239 182  13 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 241 196  14 203 166  17  22  18   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+-218 218 218 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 206 206 206 198 198 198 202 162  69
+-226 170  11 236 178  12 224 166  10 210 150  10
+-200 144  11 197 138  11 192 133   9 197 138  11
+-210 150  10 226 170  11 242 186  14 246 190  14
+-246 190  14 246 186  14 225 175  15 124 112  88
+- 62  62  62  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78 174 135  50 224 166  10
+-239 182  13 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 241 196  14 139 102  15
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 78  78  78 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 214 214 214 198 198 198 190 150  46
+-219 162  10 236 178  12 234 174  13 224 166  10
+-216 158  10 213 154  11 213 154  11 216 158  10
+-226 170  11 239 182  13 246 190  14 246 190  14
+-246 190  14 246 190  14 242 186  14 206 162  42
+-101 101 101  58  58  58  30  30  30  14  14  14
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  74  74  74 174 135  50 216 158  10
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 241 196  14 226 184  13
+- 61  42   6   2   2   6   2   2   6   2   2   6
+- 22  22  22 238 238 238 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 226 226 226 187 187 187 180 133  36
+-216 158  10 236 178  12 239 182  13 236 178  12
+-230 174  11 226 170  11 226 170  11 230 174  11
+-236 178  12 242 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 186  14 239 182  13
+-206 162  42 106 106 106  66  66  66  34  34  34
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 26  26  26  70  70  70 163 133  67 213 154  11
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 241 196  14
+-190 146  13  18  14   6   2   2   6   2   2   6
+- 46  46  46 246 246 246 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 221 221 221  86  86  86 156 107  11
+-216 158  10 236 178  12 242 186  14 246 186  14
+-242 186  14 239 182  13 239 182  13 242 186  14
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-242 186  14 225 175  15 142 122  72  66  66  66
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 26  26  26  70  70  70 163 133  67 210 150  10
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-232 195  16 121  92   8  34  34  34 106 106 106
+-221 221 221 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-242 242 242  82  82  82  18  14   6 163 110   8
+-216 158  10 236 178  12 242 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 242 186  14 163 133  67
+- 46  46  46  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78 163 133  67 210 150  10
+-236 178  12 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-241 196  14 215 174  15 190 178 144 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 218 218 218
+- 58  58  58   2   2   6  22  18   6 167 114   7
+-216 158  10 236 178  12 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 186  14 242 186  14 190 150  46
+- 54  54  54  22  22  22   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 38  38  38  86  86  86 180 133  36 213 154  11
+-236 178  12 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 232 195  16 190 146  13 214 214 214
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 170 170 170  26  26  26
+-  2   2   6   2   2   6  37  26   9 163 110   8
+-219 162  10 239 182  13 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 236 178  12 224 166  10 142 122  72
+- 46  46  46  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 109 106  95 192 133   9 224 166  10
+-242 186  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-242 186  14 226 184  13 210 162  10 142 110  46
+-226 226 226 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-198 198 198  66  66  66   2   2   6   2   2   6
+-  2   2   6   2   2   6  50  34   6 156 107  11
+-219 162  10 239 182  13 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 242 186  14
+-234 174  13 213 154  11 154 122  46  66  66  66
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 58  58  58 154 121  60 206 145  10 234 174  13
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 236 178  12 210 162  10 163 110   8
+- 61  42   6 138 138 138 218 218 218 250 250 250
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 210 210 210 144 144 144  66  66  66
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  61  42   6 163 110   8
+-216 158  10 236 178  12 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 239 182  13 230 174  11 216 158  10
+-190 142  34 124 112  88  70  70  70  38  38  38
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 62  62  62 168 124  44 206 145  10 224 166  10
+-236 178  12 239 182  13 242 186  14 242 186  14
+-246 186  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 236 178  12 216 158  10 175 118   6
+- 80  54   7   2   2   6   6   6   6  30  30  30
+- 54  54  54  62  62  62  50  50  50  38  38  38
+- 14  14  14   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  80  54   7 167 114   7
+-213 154  11 236 178  12 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 242 186  14 239 182  13 239 182  13
+-230 174  11 210 150  10 174 135  50 124 112  88
+- 82  82  82  54  54  54  34  34  34  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 158 118  36 192 133   9 200 144  11
+-216 158  10 219 162  10 224 166  10 226 170  11
+-230 174  11 236 178  12 239 182  13 239 182  13
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 230 174  11 210 150  10 163 110   8
+-104  69   6  10  10  10   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  91  60   6 167 114   7
+-206 145  10 230 174  11 242 186  14 246 190  14
+-246 190  14 246 190  14 246 186  14 242 186  14
+-239 182  13 230 174  11 224 166  10 213 154  11
+-180 133  36 124 112  88  86  86  86  58  58  58
+- 38  38  38  22  22  22  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 34  34  34  70  70  70 138 110  50 158 118  36
+-167 114   7 180 123   7 192 133   9 197 138  11
+-200 144  11 206 145  10 213 154  11 219 162  10
+-224 166  10 230 174  11 239 182  13 242 186  14
+-246 186  14 246 186  14 246 186  14 246 186  14
+-239 182  13 216 158  10 185 133  11 152  99   6
+-104  69   6  18  14   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  80  54   7 152  99   6
+-192 133   9 219 162  10 236 178  12 239 182  13
+-246 186  14 242 186  14 239 182  13 236 178  12
+-224 166  10 206 145  10 192 133   9 154 121  60
+- 94  94  94  62  62  62  42  42  42  22  22  22
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 18  18  18  34  34  34  58  58  58  78  78  78
+-101  98  89 124 112  88 142 110  46 156 107  11
+-163 110   8 167 114   7 175 118   6 180 123   7
+-185 133  11 197 138  11 210 150  10 219 162  10
+-226 170  11 236 178  12 236 178  12 234 174  13
+-219 162  10 197 138  11 163 110   8 130  83   6
+- 91  60   6  10  10  10   2   2   6   2   2   6
+- 18  18  18  38  38  38  38  38  38  38  38  38
+- 38  38  38  38  38  38  38  38  38  38  38  38
+- 38  38  38  38  38  38  26  26  26   2   2   6
+-  2   2   6   6   6   6  70  47   6 137  92   6
+-175 118   6 200 144  11 219 162  10 230 174  11
+-234 174  13 230 174  11 219 162  10 210 150  10
+-192 133   9 163 110   8 124 112  88  82  82  82
+- 50  50  50  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  22  22  22  34  34  34
+- 42  42  42  58  58  58  74  74  74  86  86  86
+-101  98  89 122 102  70 130  98  46 121  87  25
+-137  92   6 152  99   6 163 110   8 180 123   7
+-185 133  11 197 138  11 206 145  10 200 144  11
+-180 123   7 156 107  11 130  83   6 104  69   6
+- 50  34   6  54  54  54 110 110 110 101  98  89
+- 86  86  86  82  82  82  78  78  78  78  78  78
+- 78  78  78  78  78  78  78  78  78  78  78  78
+- 78  78  78  82  82  82  86  86  86  94  94  94
+-106 106 106 101 101 101  86  66  34 124  80   6
+-156 107  11 180 123   7 192 133   9 200 144  11
+-206 145  10 200 144  11 192 133   9 175 118   6
+-139 102  15 109 106  95  70  70  70  42  42  42
+- 22  22  22  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  10  10  10
+- 14  14  14  22  22  22  30  30  30  38  38  38
+- 50  50  50  62  62  62  74  74  74  90  90  90
+-101  98  89 112 100  78 121  87  25 124  80   6
+-137  92   6 152  99   6 152  99   6 152  99   6
+-138  86   6 124  80   6  98  70   6  86  66  30
+-101  98  89  82  82  82  58  58  58  46  46  46
+- 38  38  38  34  34  34  34  34  34  34  34  34
+- 34  34  34  34  34  34  34  34  34  34  34  34
+- 34  34  34  34  34  34  38  38  38  42  42  42
+- 54  54  54  82  82  82  94  86  76  91  60   6
+-134  86   6 156 107  11 167 114   7 175 118   6
+-175 118   6 167 114   7 152  99   6 121  87  25
+-101  98  89  62  62  62  34  34  34  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6   6   6   6  10  10  10
+- 18  18  18  22  22  22  30  30  30  42  42  42
+- 50  50  50  66  66  66  86  86  86 101  98  89
+-106  86  58  98  70   6 104  69   6 104  69   6
+-104  69   6  91  60   6  82  62  34  90  90  90
+- 62  62  62  38  38  38  22  22  22  14  14  14
+- 10  10  10  10  10  10  10  10  10  10  10  10
+- 10  10  10  10  10  10   6   6   6  10  10  10
+- 10  10  10  10  10  10  10  10  10  14  14  14
+- 22  22  22  42  42  42  70  70  70  89  81  66
+- 80  54   7 104  69   6 124  80   6 137  92   6
+-134  86   6 116  81   8 100  82  52  86  86  86
+- 58  58  58  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  10  10  10  14  14  14
+- 18  18  18  26  26  26  38  38  38  54  54  54
+- 70  70  70  86  86  86  94  86  76  89  81  66
+- 89  81  66  86  86  86  74  74  74  50  50  50
+- 30  30  30  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  34  34  34  58  58  58
+- 82  82  82  89  81  66  89  81  66  89  81  66
+- 94  86  66  94  86  76  74  74  74  50  50  50
+- 26  26  26  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6   6   6   6  14  14  14  18  18  18
+- 30  30  30  38  38  38  46  46  46  54  54  54
+- 50  50  50  42  42  42  30  30  30  18  18  18
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  26  26  26
+- 38  38  38  50  50  50  58  58  58  58  58  58
+- 54  54  54  42  42  42  30  30  30  18  18  18
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+-  6   6   6  10  10  10  14  14  14  18  18  18
+- 18  18  18  14  14  14  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 14  14  14  18  18  18  22  22  22  22  22  22
+- 18  18  18  14  14  14  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  3 3 3  0 0 0  0 0 0
++0 0 0  0 0 0  0 0 0  0 0 0  3 3 3  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  1 1 1  0 0 0
++0 0 0  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  2 1 0  2 1 0  3 2 2
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  2 2 2  0 0 0  3 4 3  26 28 28
++37 38 37  37 38 37  14 17 19  2 2 2  0 0 0  2 2 2
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  3 3 3  0 0 0  1 1 1  6 6 6
++2 2 2  0 0 0  3 3 3  4 4 4  4 4 4  4 4 4
++4 4 5  3 3 3  1 0 0  0 0 0  1 0 0  0 0 0
++1 1 1  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++2 2 2  0 0 0  0 0 0  14 17 19  60 74 84  137 136 137
++153 152 153  137 136 137  125 124 125  60 73 81  6 6 6  3 1 0
++0 0 0  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  0 0 0  4 4 4  41 54 63  125 124 125
++60 73 81  6 6 6  4 0 0  3 3 3  4 4 4  4 4 4
++4 4 4  0 0 0  6 9 11  41 54 63  41 65 82  22 30 35
++2 2 2  2 1 0  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  2 2 2  0 0 0
++4 0 0  6 6 6  41 54 63  137 136 137  174 174 174  167 166 167
++165 164 165  165 164 165  163 162 163  163 162 163  125 124 125  41 54 63
++1 1 1  0 0 0  0 0 0  3 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  5 5 5
++3 3 3  2 0 0  4 0 0  60 73 81  156 155 156  167 166 167
++163 162 163  85 115 134  5 7 8  0 0 0  4 4 4  5 5 5
++0 0 0  2 5 5  55 98 126  90 154 193  90 154 193  72 125 159
++37 51 59  2 0 0  1 1 1  4 5 5  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 4 4  1 1 1  0 0 0  3 3 3
++37 38 37  125 124 125  163 162 163  174 174 174  158 157 158  158 157 158
++156 155 156  156 155 156  158 157 158  165 164 165  174 174 174  166 165 166
++125 124 125  16 19 21  1 0 0  0 0 0  0 0 0  4 4 4
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  1 1 1
++0 0 0  0 0 0  37 38 37  153 152 153  174 174 174  158 157 158
++174 174 174  163 162 163  37 38 37  4 3 3  4 0 0  1 1 1
++0 0 0  22 40 52  101 161 196  101 161 196  90 154 193  101 161 196
++64 123 161  14 17 19  0 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++5 5 5  2 2 2  0 0 0  4 0 0  24 26 27  85 115 134
++156 155 156  174 174 174  167 166 167  156 155 156  154 153 154  157 156 157
++156 155 156  156 155 156  155 154 155  153 152 153  158 157 158  167 166 167
++174 174 174  156 155 156  60 74 84  16 19 21  0 0 0  0 0 0
++1 1 1  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  6 6 6  3 3 3  0 0 0  4 0 0
++13 16 17  60 73 81  137 136 137  165 164 165  156 155 156  153 152 153
++174 174 174  177 184 187  60 73 81  3 1 0  0 0 0  1 1 2
++22 30 35  64 123 161  136 185 209  90 154 193  90 154 193  90 154 193
++90 154 193  21 29 34  0 0 0  3 2 2  4 4 5  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  3 3 3
++0 0 0  0 0 0  10 13 16  60 74 84  157 156 157  174 174 174
++174 174 174  158 157 158  153 152 153  154 153 154  156 155 156  155 154 155
++156 155 156  155 154 155  154 153 154  157 156 157  154 153 154  153 152 153
++163 162 163  174 174 174  177 184 187  137 136 137  60 73 81  13 16 17
++4 0 0  0 0 0  3 3 3  5 5 5  4 4 4  4 4 4
++5 5 5  4 4 4  1 1 1  0 0 0  3 3 3  41 54 63
++131 129 131  174 174 174  174 174 174  174 174 174  167 166 167  174 174 174
++190 197 201  137 136 137  24 26 27  4 0 0  16 21 25  50 82 103
++90 154 193  136 185 209  90 154 193  101 161 196  101 161 196  101 161 196
++31 91 132  3 6 7  0 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  2 2 2  0 0 0  4 0 0
++4 0 0  43 57 68  137 136 137  177 184 187  174 174 174  163 162 163
++155 154 155  155 154 155  156 155 156  155 154 155  158 157 158  165 164 165
++167 166 167  166 165 166  163 162 163  157 156 157  155 154 155  155 154 155
++153 152 153  156 155 156  167 166 167  174 174 174  174 174 174  131 129 131
++41 54 63  5 5 5  0 0 0  0 0 0  3 3 3  4 4 4
++1 1 1  0 0 0  1 0 0  26 28 28  125 124 125  174 174 174
++177 184 187  174 174 174  174 174 174  156 155 156  131 129 131  137 136 137
++125 124 125  24 26 27  4 0 0  41 65 82  90 154 193  136 185 209
++136 185 209  101 161 196  53 118 160  37 112 160  90 154 193  34 86 122
++7 12 15  0 0 0  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  3 3 3  0 0 0  0 0 0  5 5 5  37 38 37
++125 124 125  167 166 167  174 174 174  167 166 167  158 157 158  155 154 155
++156 155 156  156 155 156  156 155 156  163 162 163  167 166 167  155 154 155
++137 136 137  153 152 153  156 155 156  165 164 165  163 162 163  156 155 156
++156 155 156  156 155 156  155 154 155  158 157 158  166 165 166  174 174 174
++167 166 167  125 124 125  37 38 37  1 0 0  0 0 0  0 0 0
++0 0 0  24 26 27  60 74 84  158 157 158  174 174 174  174 174 174
++166 165 166  158 157 158  125 124 125  41 54 63  13 16 17  6 6 6
++6 6 6  37 38 37  80 127 157  136 185 209  101 161 196  101 161 196
++90 154 193  28 67 93  6 10 14  13 20 25  13 20 25  6 10 14
++1 1 2  4 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++1 1 1  1 0 0  4 3 3  37 38 37  60 74 84  153 152 153
++167 166 167  167 166 167  158 157 158  154 153 154  155 154 155  156 155 156
++157 156 157  158 157 158  167 166 167  167 166 167  131 129 131  43 57 68
++26 28 28  37 38 37  60 73 81  131 129 131  165 164 165  166 165 166
++158 157 158  155 154 155  156 155 156  156 155 156  156 155 156  158 157 158
++165 164 165  174 174 174  163 162 163  60 74 84  16 19 21  13 16 17
++60 73 81  131 129 131  174 174 174  174 174 174  167 166 167  165 164 165
++137 136 137  60 73 81  24 26 27  4 0 0  4 0 0  16 19 21
++52 104 138  101 161 196  136 185 209  136 185 209  90 154 193  27 99 146
++13 20 25  4 5 7  2 5 5  4 5 7  1 1 2  0 0 0
++4 4 4  4 4 4  3 3 3  2 2 2  2 2 2  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  0 0 0
++0 0 0  13 16 17  60 73 81  137 136 137  174 174 174  166 165 166
++158 157 158  156 155 156  157 156 157  156 155 156  155 154 155  158 157 158
++167 166 167  174 174 174  153 152 153  60 73 81  16 19 21  4 0 0
++4 0 0  4 0 0  6 6 6  26 28 28  60 74 84  158 157 158
++174 174 174  166 165 166  157 156 157  155 154 155  156 155 156  156 155 156
++155 154 155  158 157 158  167 166 167  167 166 167  131 129 131  125 124 125
++137 136 137  167 166 167  167 166 167  174 174 174  158 157 158  125 124 125
++16 19 21  4 0 0  4 0 0  10 13 16  49 76 92  107 159 188
++136 185 209  136 185 209  90 154 193  26 108 161  22 40 52  6 10 14
++2 3 3  1 1 2  1 1 2  4 4 5  4 4 5  4 4 5
++4 4 5  2 2 1  0 0 0  0 0 0  0 0 0  2 2 2
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  3 3 3  0 0 0  1 0 0  4 0 0
++37 51 59  131 129 131  167 166 167  167 166 167  163 162 163  157 156 157
++157 156 157  155 154 155  153 152 153  157 156 157  167 166 167  174 174 174
++153 152 153  125 124 125  37 38 37  4 0 0  4 0 0  4 0 0
++4 3 3  4 3 3  4 0 0  6 6 6  4 0 0  37 38 37
++125 124 125  174 174 174  174 174 174  165 164 165  156 155 156  154 153 154
++156 155 156  156 155 156  155 154 155  163 162 163  158 157 158  163 162 163
++174 174 174  174 174 174  174 174 174  125 124 125  37 38 37  0 0 0
++4 0 0  6 9 11  41 54 63  90 154 193  136 185 209  146 190 211
++136 185 209  37 112 160  22 40 52  6 10 14  3 6 7  1 1 2
++1 1 2  3 3 3  1 1 2  3 3 3  4 4 4  4 4 4
++2 2 2  2 0 0  16 19 21  37 38 37  24 26 27  0 0 0
++0 0 0  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  5 5 5
++4 4 4  0 0 0  0 0 0  0 0 0  26 28 28  120 125 127
++158 157 158  174 174 174  165 164 165  157 156 157  155 154 155  156 155 156
++153 152 153  153 152 153  167 166 167  174 174 174  174 174 174  125 124 125
++37 38 37  4 0 0  0 0 0  4 0 0  4 3 3  4 4 4
++4 4 4  4 4 4  5 5 5  4 0 0  4 0 0  4 0 0
++4 3 3  43 57 68  137 136 137  174 174 174  174 174 174  165 164 165
++154 153 154  153 152 153  153 152 153  153 152 153  163 162 163  174 174 174
++174 174 174  153 152 153  60 73 81  6 6 6  4 0 0  4 3 3
++32 43 50  80 127 157  136 185 209  146 190 211  146 190 211  90 154 193
++28 67 93  28 67 93  40 71 93  3 6 7  1 1 2  2 5 5
++50 82 103  79 117 143  26 37 45  0 0 0  3 3 3  1 1 1
++0 0 0  41 54 63  137 136 137  174 174 174  153 152 153  60 73 81
++2 0 0  0 0 0
++4 4 4  4 4 4  4 4 4  4 4 4  6 6 6  2 2 2
++0 0 0  2 0 0  24 26 27  60 74 84  153 152 153  174 174 174
++174 174 174  157 156 157  154 153 154  156 155 156  154 153 154  153 152 153
++165 164 165  174 174 174  177 184 187  137 136 137  43 57 68  6 6 6
++4 0 0  2 0 0  3 3 3  5 5 5  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  6 6 6  4 3 3
++4 0 0  4 0 0  24 26 27  60 73 81  153 152 153  174 174 174
++174 174 174  158 157 158  158 157 158  174 174 174  174 174 174  158 157 158
++60 74 84  24 26 27  4 0 0  4 0 0  17 23 27  59 113 148
++136 185 209  191 222 234  146 190 211  136 185 209  31 91 132  7 11 13
++22 40 52  101 161 196  90 154 193  6 9 11  3 4 4  43 95 132
++136 185 209  172 205 220  55 98 126  0 0 0  0 0 0  2 0 0
++26 28 28  153 152 153  177 184 187  167 166 167  177 184 187  165 164 165
++37 38 37  0 0 0
++4 4 4  4 4 4  5 5 5  5 5 5  1 1 1  0 0 0
++13 16 17  60 73 81  137 136 137  174 174 174  174 174 174  165 164 165
++153 152 153  153 152 153  155 154 155  154 153 154  158 157 158  174 174 174
++177 184 187  163 162 163  60 73 81  16 19 21  4 0 0  4 0 0
++4 3 3  4 4 4  5 5 5  5 5 5  4 4 4  5 5 5
++5 5 5  5 5 5  5 5 5  4 4 4  4 4 4  5 5 5
++6 6 6  4 0 0  4 0 0  4 0 0  24 26 27  60 74 84
++166 165 166  174 174 174  177 184 187  165 164 165  125 124 125  24 26 27
++4 0 0  4 0 0  5 5 5  50 82 103  136 185 209  172 205 220
++146 190 211  136 185 209  26 108 161  22 40 52  7 12 15  44 81 103
++71 116 144  28 67 93  37 51 59  41 65 82  100 139 164  101 161 196
++90 154 193  90 154 193  28 67 93  0 0 0  0 0 0  26 28 28
++125 124 125  167 166 167  163 162 163  153 152 153  163 162 163  174 174 174
++85 115 134  4 0 0
++4 4 4  5 5 5  4 4 4  1 0 0  4 0 0  34 47 55
++125 124 125  174 174 174  174 174 174  167 166 167  157 156 157  153 152 153
++155 154 155  155 154 155  158 157 158  166 165 166  167 166 167  154 153 154
++125 124 125  26 28 28  4 0 0  4 0 0  4 0 0  5 5 5
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  1 1 1
++0 0 0  0 0 0  1 1 1  4 4 4  4 4 4  4 4 4
++5 5 5  5 5 5  4 3 3  4 0 0  4 0 0  6 6 6
++37 38 37  131 129 131  137 136 137  37 38 37  0 0 0  4 0 0
++4 5 5  43 61 72  90 154 193  172 205 220  146 190 211  136 185 209
++90 154 193  28 67 93  13 20 25  43 61 72  71 116 144  44 81 103
++2 5 5  7 11 13  59 113 148  101 161 196  90 154 193  28 67 93
++13 20 25  6 10 14  0 0 0  13 16 17  60 73 81  137 136 137
++166 165 166  158 157 158  156 155 156  154 153 154  167 166 167  174 174 174
++60 73 81  4 0 0
++4 4 4  4 4 4  0 0 0  3 3 3  60 74 84  174 174 174
++174 174 174  167 166 167  163 162 163  155 154 155  157 156 157  155 154 155
++156 155 156  163 162 163  167 166 167  158 157 158  125 124 125  37 38 37
++4 3 3  4 0 0  4 0 0  6 6 6  6 6 6  5 5 5
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  2 3 3
++10 13 16  7 11 13  1 0 0  0 0 0  2 2 1  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  4 0 0
++4 0 0  7 11 13  13 16 17  4 0 0  3 3 3  34 47 55
++80 127 157  146 190 211  172 205 220  136 185 209  136 185 209  136 185 209
++28 67 93  22 40 52  55 98 126  55 98 126  21 29 34  7 11 13
++50 82 103  101 161 196  101 161 196  35 83 115  13 20 25  2 2 1
++1 1 2  1 1 2  37 51 59  131 129 131  174 174 174  174 174 174
++167 166 167  163 162 163  163 162 163  167 166 167  174 174 174  125 124 125
++16 19 21  4 0 0
++4 4 4  4 0 0  4 0 0  60 74 84  174 174 174  174 174 174
++158 157 158  155 154 155  155 154 155  156 155 156  155 154 155  158 157 158
++167 166 167  165 164 165  131 129 131  60 73 81  13 16 17  4 0 0
++4 0 0  4 3 3  6 6 6  4 3 3  5 5 5  4 4 4
++4 4 4  3 2 2  0 0 0  0 0 0  7 11 13  45 69 86
++80 127 157  71 116 144  43 61 72  7 11 13  0 0 0  1 1 1
++4 3 3  4 4 4  4 4 4  4 4 4  6 6 6  5 5 5
++3 2 2  4 0 0  1 0 0  21 29 34  59 113 148  136 185 209
++146 190 211  136 185 209  136 185 209  136 185 209  136 185 209  136 185 209
++68 124 159  44 81 103  22 40 52  13 16 17  43 61 72  90 154 193
++136 185 209  59 113 148  21 29 34  3 4 3  1 1 1  0 0 0
++24 26 27  125 124 125  163 162 163  174 174 174  166 165 166  165 164 165
++163 162 163  125 124 125  125 124 125  125 124 125  125 124 125  26 28 28
++4 0 0  4 3 3
++3 3 3  0 0 0  24 26 27  153 152 153  177 184 187  158 157 158
++156 155 156  156 155 156  155 154 155  155 154 155  165 164 165  174 174 174
++155 154 155  60 74 84  26 28 28  4 0 0  4 0 0  3 1 0
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 3 3
++2 0 0  0 0 0  0 0 0  32 43 50  72 125 159  101 161 196
++136 185 209  101 161 196  101 161 196  79 117 143  32 43 50  0 0 0
++0 0 0  2 2 2  4 4 4  4 4 4  3 3 3  1 0 0
++0 0 0  4 5 5  49 76 92  101 161 196  146 190 211  146 190 211
++136 185 209  136 185 209  136 185 209  136 185 209  136 185 209  90 154 193
++28 67 93  13 16 17  37 51 59  80 127 157  136 185 209  90 154 193
++22 40 52  6 9 11  3 4 3  2 2 1  16 19 21  60 73 81
++137 136 137  163 162 163  158 157 158  166 165 166  167 166 167  153 152 153
++60 74 84  37 38 37  6 6 6  13 16 17  4 0 0  1 0 0
++3 2 2  4 4 4
++3 2 2  4 0 0  37 38 37  137 136 137  167 166 167  158 157 158
++157 156 157  154 153 154  157 156 157  167 166 167  174 174 174  125 124 125
++37 38 37  4 0 0  4 0 0  4 0 0  4 3 3  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  1 1 1  0 0 0
++0 0 0  16 21 25  55 98 126  90 154 193  136 185 209  101 161 196
++101 161 196  101 161 196  136 185 209  136 185 209  101 161 196  55 98 126
++14 17 19  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
++22 40 52  90 154 193  146 190 211  146 190 211  136 185 209  136 185 209
++136 185 209  136 185 209  136 185 209  101 161 196  35 83 115  7 11 13
++17 23 27  59 113 148  136 185 209  101 161 196  34 86 122  7 12 15
++2 5 5  3 4 3  6 6 6  60 73 81  131 129 131  163 162 163
++166 165 166  174 174 174  174 174 174  163 162 163  125 124 125  41 54 63
++13 16 17  4 0 0  4 0 0  4 0 0  1 0 0  2 2 2
++4 4 4  4 4 4
++1 1 1  2 1 0  43 57 68  137 136 137  153 152 153  153 152 153
++163 162 163  156 155 156  165 164 165  167 166 167  60 74 84  6 6 6
++4 0 0  4 0 0  5 5 5  4 4 4  4 4 4  4 4 4
++4 5 5  6 6 6  4 3 3  0 0 0  0 0 0  11 15 18
++40 71 93  100 139 164  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  136 185 209  136 185 209
++101 161 196  45 69 86  6 6 6  0 0 0  17 23 27  55 98 126
++136 185 209  146 190 211  136 185 209  136 185 209  136 185 209  136 185 209
++136 185 209  136 185 209  90 154 193  22 40 52  7 11 13  50 82 103
++136 185 209  136 185 209  53 118 160  22 40 52  7 11 13  2 5 5
++3 4 3  37 38 37  125 124 125  157 156 157  166 165 166  167 166 167
++174 174 174  174 174 174  137 136 137  60 73 81  4 0 0  4 0 0
++4 0 0  4 0 0  5 5 5  3 3 3  3 3 3  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  137 136 137  125 124 125  131 129 131
++155 154 155  167 166 167  174 174 174  60 74 84  6 6 6  4 0 0
++4 3 3  6 6 6  4 4 4  4 4 4  4 4 4  5 5 5
++4 4 4  1 1 1  0 0 0  3 6 7  41 65 82  72 125 159
++101 161 196  101 161 196  101 161 196  90 154 193  90 154 193  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  136 185 209
++136 185 209  136 185 209  80 127 157  55 98 126  101 161 196  146 190 211
++136 185 209  136 185 209  136 185 209  101 161 196  136 185 209  101 161 196
++136 185 209  101 161 196  35 83 115  22 30 35  101 161 196  172 205 220
++90 154 193  28 67 93  7 11 13  2 5 5  3 4 3  13 16 17
++85 115 134  167 166 167  174 174 174  174 174 174  174 174 174  174 174 174
++167 166 167  60 74 84  13 16 17  4 0 0  4 0 0  4 3 3
++6 6 6  5 5 5  4 4 4  5 5 5  4 4 4  5 5 5
++5 5 5  5 5 5
++1 1 1  4 0 0  41 54 63  137 136 137  137 136 137  125 124 125
++131 129 131  167 166 167  157 156 157  37 38 37  6 6 6  4 0 0
++6 6 6  5 5 5  4 4 4  4 4 4  4 5 5  2 2 1
++0 0 0  0 0 0  26 37 45  58 111 146  101 161 196  101 161 196
++101 161 196  90 154 193  90 154 193  90 154 193  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  136 185 209  136 185 209  136 185 209  146 190 211  136 185 209
++136 185 209  101 161 196  136 185 209  136 185 209  101 161 196  136 185 209
++101 161 196  136 185 209  136 185 209  136 185 209  136 185 209  16 89 141
++7 11 13  2 5 5  2 5 5  13 16 17  60 73 81  154 154 154
++174 174 174  174 174 174  174 174 174  174 174 174  163 162 163  125 124 125
++24 26 27  4 0 0  4 0 0  4 0 0  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
++5 5 5  4 4 4
++4 0 0  6 6 6  37 38 37  137 136 137  137 136 137  131 129 131
++131 129 131  153 152 153  131 129 131  26 28 28  4 0 0  4 3 3
++6 6 6  4 4 4  4 4 4  4 4 4  0 0 0  0 0 0
++13 20 25  51 88 114  90 154 193  101 161 196  101 161 196  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  136 185 209  101 161 196
++101 161 196  136 185 209  101 161 196  136 185 209  136 185 209  101 161 196
++136 185 209  101 161 196  136 185 209  101 161 196  101 161 196  101 161 196
++136 185 209  136 185 209  136 185 209  37 112 160  21 29 34  5 7 8
++2 5 5  13 16 17  43 57 68  131 129 131  174 174 174  174 174 174
++174 174 174  167 166 167  157 156 157  125 124 125  37 38 37  4 0 0
++4 0 0  4 0 0  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  41 54 63  153 152 153  137 136 137  137 136 137
++137 136 137  153 152 153  125 124 125  24 26 27  4 0 0  3 2 2
++4 4 4  4 4 4  4 3 3  4 0 0  3 6 7  43 61 72
++64 123 161  101 161 196  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  101 161 196  90 154 193
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++136 185 209  101 161 196  101 161 196  136 185 209  136 185 209  101 161 196
++101 161 196  90 154 193  28 67 93  13 16 17  7 11 13  3 6 7
++37 51 59  125 124 125  163 162 163  174 174 174  167 166 167  166 165 166
++167 166 167  131 129 131  60 73 81  4 0 0  4 0 0  4 0 0
++3 3 3  5 5 5  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  137 136 137  153 152 153  137 136 137
++153 152 153  157 156 157  125 124 125  24 26 27  0 0 0  2 2 2
++4 4 4  4 4 4  2 0 0  0 0 0  28 67 93  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  64 123 161  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++90 154 193  101 161 196  101 161 196  101 161 196  90 154 193  136 185 209
++101 161 196  101 161 196  136 185 209  101 161 196  136 185 209  101 161 196
++101 161 196  101 161 196  136 185 209  101 161 196  101 161 196  90 154 193
++35 83 115  13 16 17  3 6 7  2 5 5  13 16 17  60 74 84
++154 154 154  166 165 166  165 164 165  158 157 158  163 162 163  157 156 157
++60 74 84  13 16 17  4 0 0  4 0 0  3 2 2  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  41 54 63  157 156 157  155 154 155  137 136 137
++153 152 153  158 157 158  137 136 137  26 28 28  2 0 0  2 2 2
++4 4 4  4 4 4  1 0 0  6 10 14  34 86 122  90 154 193
++64 123 161  90 154 193  64 123 161  90 154 193  90 154 193  90 154 193
++64 123 161  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++136 185 209  101 161 196  136 185 209  90 154 193  26 108 161  22 40 52
++13 16 17  5 7 8  2 5 5  2 5 5  37 38 37  165 164 165
++174 174 174  163 162 163  154 154 154  165 164 165  167 166 167  60 73 81
++6 6 6  4 0 0  4 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  41 54 63  156 155 156  158 157 158  153 152 153
++156 155 156  165 164 165  137 136 137  26 28 28  0 0 0  2 2 2
++4 4 5  4 4 4  2 0 0  7 12 15  31 96 139  64 123 161
++90 154 193  64 123 161  90 154 193  90 154 193  64 123 161  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  136 185 209
++101 161 196  136 185 209  26 108 161  22 40 52  7 11 13  5 7 8
++2 5 5  2 5 5  2 5 5  2 2 1  37 38 37  158 157 158
++174 174 174  154 154 154  156 155 156  167 166 167  165 164 165  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  157 156 157  163 162 163  153 152 153
++158 157 158  167 166 167  137 136 137  26 28 28  2 0 0  2 2 2
++4 5 5  4 4 4  4 0 0  7 12 15  24 86 132  26 108 161
++37 112 160  64 123 161  90 154 193  64 123 161  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  101 161 196  90 154 193  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  136 185 209  101 161 196  136 185 209
++90 154 193  35 83 115  13 16 17  13 16 17  7 11 13  3 6 7
++5 7 8  6 6 6  3 4 3  2 2 1  30 32 34  154 154 154
++167 166 167  154 154 154  154 154 154  174 174 174  165 164 165  37 38 37
++6 6 6  4 0 0  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  163 162 163  166 165 166  154 154 154
++163 162 163  174 174 174  137 136 137  26 28 28  0 0 0  2 2 2
++4 5 5  4 4 5  1 1 2  6 10 14  28 67 93  18 97 151
++18 97 151  18 97 151  26 108 161  37 112 160  37 112 160  90 154 193
++64 123 161  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++90 154 193  101 161 196  101 161 196  90 154 193  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  136 185 209  90 154 193  16 89 141
++13 20 25  7 11 13  5 7 8  5 7 8  2 5 5  4 5 5
++3 4 3  4 5 5  3 4 3  0 0 0  37 38 37  158 157 158
++174 174 174  158 157 158  158 157 158  167 166 167  174 174 174  41 54 63
++4 0 0  3 2 2  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  165 164 165  174 174 174  158 157 158
++167 166 167  174 174 174  153 152 153  26 28 28  2 0 0  2 2 2
++4 5 5  4 4 4  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  18 97 151  18 97 151  26 108 161  26 108 161  26 108 161
++26 108 161  37 112 160  53 118 160  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  136 185 209  90 154 193  26 108 161  22 40 52  13 16 17
++7 11 13  3 6 7  5 7 8  5 7 8  2 5 5  4 5 5
++4 5 5  6 6 6  3 4 3  0 0 0  30 32 34  158 157 158
++174 174 174  156 155 156  155 154 155  165 164 165  154 153 154  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  167 166 167  174 174 174  163 162 163
++174 174 174  174 174 174  153 152 153  26 28 28  0 0 0  3 3 3
++5 5 5  4 4 4  1 1 2  7 12 15  28 67 93  18 97 151
++18 97 151  18 97 151  18 97 151  18 97 151  18 97 151  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++90 154 193  26 108 161  90 154 193  90 154 193  90 154 193  101 161 196
++101 161 196  26 108 161  22 40 52  13 16 17  7 11 13  2 5 5
++2 5 5  6 6 6  2 5 5  4 5 5  4 5 5  4 5 5
++3 4 3  5 5 5  3 4 3  2 0 0  30 32 34  137 136 137
++153 152 153  137 136 137  131 129 131  137 136 137  131 129 131  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  167 166 167  174 174 174  166 165 166
++174 174 174  177 184 187  153 152 153  30 32 34  1 0 0  3 3 3
++5 5 5  4 3 3  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  18 97 151  18 97 151  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  90 154 193  90 154 193  26 108 161
++35 83 115  13 16 17  7 11 13  5 7 8  3 6 7  5 7 8
++2 5 5  6 6 6  4 5 5  4 5 5  3 4 3  4 5 5
++3 4 3  6 6 6  3 4 3  0 0 0  26 28 28  125 124 125
++131 129 131  125 124 125  125 124 125  131 129 131  131 129 131  37 38 37
++4 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  174 174 174  177 184 187  167 166 167
++174 174 174  177 184 187  153 152 153  30 32 34  0 0 0  3 3 3
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  18 97 151
++18 97 151  18 97 151  18 97 151  18 97 151  18 97 151  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  90 154 193  26 108 161  26 108 161  24 86 132  13 20 25
++7 11 13  13 20 25  22 40 52  5 7 8  3 4 3  3 4 3
++4 5 5  3 4 3  4 5 5  3 4 3  4 5 5  3 4 3
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  125 124 125
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  174 174 174  177 184 187  174 174 174
++174 174 174  190 197 201  157 156 157  30 32 34  1 0 0  3 3 3
++5 5 5  4 3 3  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  19 95 150  19 95 150  18 97 151  18 97 151  26 108 161
++18 97 151  26 108 161  26 108 161  26 108 161  26 108 161  90 154 193
++26 108 161  26 108 161  26 108 161  22 40 52  2 5 5  3 4 3
++28 67 93  37 112 160  34 86 122  2 5 5  3 4 3  3 4 3
++3 4 3  3 4 3  3 4 3  2 2 1  3 4 3  4 4 4
++4 5 5  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  174 174 174  177 184 187  174 174 174
++174 174 174  190 197 201  158 157 158  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  18 97 151
++10 87 144  19 95 150  19 95 150  18 97 151  18 97 151  18 97 151
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++18 97 151  22 40 52  2 5 5  2 2 1  22 40 52  26 108 161
++90 154 193  37 112 160  22 40 52  3 4 3  13 20 25  22 30 35
++3 6 7  1 1 1  2 2 2  6 9 11  5 5 5  4 3 3
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  177 184 187  193 200 203  174 174 174
++177 184 187  193 200 203  163 162 163  30 32 34  4 0 0  2 2 2
++5 5 5  4 3 3  4 0 0  6 10 14  24 86 132  10 87 144
++10 87 144  10 87 144  19 95 150  19 95 150  19 95 150  18 97 151
++26 108 161  26 108 161  26 108 161  90 154 193  26 108 161  28 67 93
++6 10 14  2 5 5  13 20 25  24 86 132  37 112 160  90 154 193
++10 87 144  7 12 15  2 5 5  28 67 93  37 112 160  28 67 93
++2 2 1  7 12 15  35 83 115  28 67 93  3 6 7  1 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  174 174 174  190 197 201  174 174 174
++177 184 187  193 200 203  163 162 163  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  16 89 141  19 95 150  10 87 144  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  28 67 93  6 10 14  1 1 2
++7 12 15  28 67 93  26 108 161  16 89 141  24 86 132  21 29 34
++3 4 3  21 29 34  37 112 160  37 112 160  27 99 146  21 29 34
++21 29 34  26 108 161  90 154 193  35 83 115  1 1 2  2 0 0
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  125 124 125
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  193 200 203  193 200 203  174 174 174
++190 197 201  193 200 203  165 164 165  37 38 37  4 0 0  2 2 2
++5 5 5  4 3 3  4 0 0  6 10 14  24 86 132  10 87 144
++10 87 144  10 87 144  16 89 141  18 97 151  18 97 151  10 87 144
++24 86 132  24 86 132  13 20 25  4 5 7  4 5 7  22 40 52
++18 97 151  37 112 160  26 108 161  7 12 15  1 1 1  0 0 0
++28 67 93  37 112 160  26 108 161  28 67 93  22 40 52  28 67 93
++26 108 161  90 154 193  26 108 161  10 87 144  0 0 0  2 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  193 200 203  174 174 174
++190 197 201  193 200 203  165 164 165  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  10 87 144  18 97 151  28 67 93  6 10 14
++0 0 0  1 1 2  4 5 7  13 20 25  16 89 141  26 108 161
++26 108 161  26 108 161  24 86 132  6 9 11  2 3 3  22 40 52
++37 112 160  16 89 141  22 40 52  28 67 93  26 108 161  26 108 161
++90 154 193  26 108 161  26 108 161  28 67 93  1 1 1  4 0 0
++4 4 4  5 5 5  3 3 3  4 0 0  26 28 28  124 126 130
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  193 200 203  193 200 203  174 174 174
++193 200 203  193 200 203  167 166 167  37 38 37  4 0 0  2 2 2
++5 5 5  4 4 4  4 0 0  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  13 20 25  4 5 7
++1 1 2  1 1 1  22 40 52  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  24 86 132  22 40 52  22 40 52
++22 40 52  22 40 52  10 87 144  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  90 154 193  10 87 144  0 0 0  4 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  205 212 215  167 166 167  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  22 40 52  1 1 2
++2 0 0  1 1 2  24 86 132  26 108 161  26 108 161  26 108 161
++26 108 161  19 95 150  16 89 141  10 87 144  22 40 52  22 40 52
++10 87 144  26 108 161  37 112 160  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  28 67 93  2 0 0  3 1 0
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  190 197 201  174 174 174
++193 200 203  193 200 203  174 174 174  37 38 37  4 0 0  2 2 2
++5 5 5  4 4 4  3 2 2  1 1 2  13 20 25  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  13 20 25
++13 20 25  22 40 52  10 87 144  18 97 151  18 97 151  26 108 161
++10 87 144  13 20 25  6 10 14  21 29 34  24 86 132  18 97 151
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  90 154 193  18 97 151  13 20 25  0 0 0  4 3 3
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  220 221 221  167 166 167  30 32 34  1 0 0  2 2 2
++5 5 5  4 4 4  4 4 5  2 5 5  4 5 7  13 20 25
++28 67 93  10 87 144  10 87 144  10 87 144  10 87 144  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  18 97 151  18 97 151
++28 67 93  2 3 3  0 0 0  28 67 93  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  10 87 144  13 20 25  1 1 2  3 2 2  4 4 4
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  190 197 201  174 174 174
++193 200 203  193 200 203  174 174 174  26 28 28  4 0 0  4 3 3
++5 5 5  4 4 4  4 4 4  4 4 5  1 1 2  2 5 5
++4 5 7  22 40 52  10 87 144  10 87 144  18 97 151  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  18 97 151
++10 87 144  28 67 93  22 40 52  10 87 144  26 108 161  18 97 151
++18 97 151  18 97 151  26 108 161  26 108 161  26 108 161  26 108 161
++22 40 52  1 1 2  0 0 0  2 3 3  4 4 4  4 4 4
++4 4 4  5 5 5  4 4 4  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  220 221 221  190 197 201  41 54 63  4 0 0  2 2 2
++6 6 6  4 4 4  4 4 4  4 4 5  4 4 5  3 3 3
++1 1 2  1 1 2  6 10 14  22 40 52  10 87 144  18 97 151
++18 97 151  10 87 144  10 87 144  10 87 144  18 97 151  10 87 144
++10 87 144  18 97 151  26 108 161  18 97 151  18 97 151  10 87 144
++26 108 161  26 108 161  26 108 161  10 87 144  28 67 93  6 10 14
++1 1 2  1 1 2  4 3 3  4 4 5  4 4 4  4 4 4
++5 5 5  5 5 5  1 1 1  4 0 0  37 51 59  137 136 137
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  193 200 203  174 174 174
++193 200 203  193 200 203  220 221 221  137 136 137  13 16 17  4 0 0
++2 2 2  4 4 4  4 4 4  4 4 4  4 4 4  4 4 5
++4 4 5  4 3 3  1 1 2  4 5 7  13 20 25  28 67 93
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  10 87 144
++10 87 144  18 97 151  18 97 151  10 87 144  18 97 151  26 108 161
++26 108 161  18 97 151  28 67 93  6 10 14  0 0 0  0 0 0
++2 3 3  4 5 5  4 4 5  4 4 4  4 4 4  5 5 5
++3 3 3  1 1 1  0 0 0  16 19 21  125 124 125  137 136 137
++131 129 131  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++193 200 203  190 197 201  220 221 221  220 221 221  153 152 153  30 32 34
++0 0 0  0 0 0  2 2 2  4 4 4  4 4 4  4 4 4
++4 4 4  4 5 5  4 5 7  1 1 2  1 1 2  4 5 7
++13 20 25  28 67 93  10 87 144  18 97 151  10 87 144  10 87 144
++10 87 144  10 87 144  10 87 144  18 97 151  26 108 161  18 97 151
++28 67 93  7 12 15  0 0 0  0 0 0  2 2 1  4 4 4
++4 5 5  4 5 5  4 4 4  4 4 4  3 3 3  0 0 0
++0 0 0  0 0 0  37 38 37  125 124 125  158 157 158  131 129 131
++125 124 125  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  4 0 0  41 54 63  193 200 203  220 221 221  174 174 174
++193 200 203  193 200 203  193 200 203  220 221 221  244 246 246  193 200 203
++120 125 127  5 5 5  1 0 0  0 0 0  1 1 1  4 4 4
++4 4 4  4 4 4  4 5 5  4 5 5  4 4 5  1 1 2
++4 5 7  4 5 7  22 40 52  10 87 144  10 87 144  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  10 87 144  13 20 25
++4 5 7  2 3 3  1 1 2  4 4 4  4 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  1 1 2
++24 26 27  60 74 84  153 152 153  163 162 163  137 136 137  125 124 125
++125 124 125  125 124 125  125 124 125  137 136 137  125 124 125  26 28 28
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  26 28 28  156 155 156  220 221 221  220 221 221
++174 174 174  193 200 203  193 200 203  193 200 203  205 212 215  220 221 221
++220 221 221  167 166 167  60 73 81  7 11 13  0 0 0  0 0 0
++3 3 3  4 4 4  4 4 4  4 4 4  4 4 5  4 4 5
++4 4 5  1 1 2  1 1 2  4 5 7  22 40 52  10 87 144
++10 87 144  10 87 144  10 87 144  22 40 52  4 5 7  1 1 2
++1 1 2  4 4 5  4 4 4  4 4 4  4 4 4  4 4 4
++5 5 5  2 2 2  0 0 0  4 0 0  16 19 21  60 73 81
++137 136 137  167 166 167  158 157 158  137 136 137  131 129 131  131 129 131
++125 124 125  125 124 125  131 129 131  155 154 155  60 74 84  5 7 8
++0 0 0  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 0 0  4 0 0  60 73 81  193 200 203  220 221 221
++193 200 203  193 200 203  193 200 203  193 200 203  205 212 215  220 221 221
++220 221 221  220 221 221  220 221 221  137 136 137  43 57 68  6 6 6
++4 0 0  1 1 1  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 5  4 4 5  3 2 2  1 1 2  2 5 5  13 20 25
++22 40 52  22 40 52  13 20 25  2 3 3  1 1 2  3 3 3
++4 5 7  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++1 1 1  0 0 0  2 3 3  41 54 63  131 129 131  166 165 166
++166 165 166  155 154 155  153 152 153  137 136 137  137 136 137  125 124 125
++125 124 125  137 136 137  137 136 137  125 124 125  37 38 37  4 3 3
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  6 6 6  6 6 6  13 16 17  60 73 81  167 166 167
++220 221 221  220 221 221  220 221 221  193 200 203  193 200 203  193 200 203
++205 212 215  220 221 221  220 221 221  244 246 246  205 212 215  125 124 125
++24 26 27  0 0 0  0 0 0  2 2 2  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 5  1 1 2  4 5 7
++4 5 7  4 5 7  1 1 2  3 2 2  4 4 5  4 4 4
++4 4 4  4 4 4  5 5 5  4 4 4  0 0 0  0 0 0
++2 0 0  26 28 28  125 124 125  174 174 174  174 174 174  166 165 166
++156 155 156  153 152 153  137 136 137  137 136 137  131 129 131  137 136 137
++137 136 137  137 136 137  60 74 84  30 32 34  4 0 0  4 0 0
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  6 6 6  4 0 0  4 0 0  6 6 6  26 28 28
++125 124 125  174 174 174  220 221 221  220 221 221  220 221 221  193 200 203
++205 212 215  220 221 221  205 212 215  220 221 221  220 221 221  244 246 246
++193 200 203  60 74 84  13 16 17  4 0 0  0 0 0  3 3 3
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 5  3 3 3
++1 1 2  3 3 3  4 4 5  4 4 5  4 4 4  4 4 4
++5 5 5  5 5 5  2 2 2  0 0 0  0 0 0  13 16 17
++60 74 84  174 174 174  193 200 203  174 174 174  167 166 167  163 162 163
++153 152 153  153 152 153  137 136 137  137 136 137  153 152 153  137 136 137
++125 124 125  41 54 63  24 26 27  4 0 0  4 0 0  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++6 6 6  37 38 37  131 129 131  220 221 221  220 221 221  220 221 221
++193 200 203  193 200 203  220 221 221  205 212 215  220 221 221  244 246 246
++244 246 246  244 246 246  174 174 174  41 54 63  0 0 0  0 0 0
++0 0 0  4 4 4  5 5 5  5 5 5  4 4 4  4 4 5
++4 4 5  4 4 5  4 4 4  4 4 4  6 6 6  6 6 6
++3 3 3  0 0 0  2 0 0  13 16 17  60 73 81  156 155 156
++220 221 221  193 200 203  174 174 174  165 164 165  163 162 163  154 153 154
++153 152 153  153 152 153  158 157 158  163 162 163  137 136 137  60 73 81
++13 16 17  4 0 0  4 0 0  4 3 3  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  4 3 3  6 6 6  6 6 6  6 6 6
++6 6 6  6 6 6  6 6 6  37 38 37  167 166 167  244 246 246
++244 246 246  220 221 221  205 212 215  205 212 215  220 221 221  193 200 203
++220 221 221  244 246 246  244 246 246  244 246 246  137 136 137  37 38 37
++3 2 2  0 0 0  1 1 1  5 5 5  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 4 4  1 1 1
++0 0 0  5 5 5  43 57 68  153 152 153  193 200 203  220 221 221
++177 184 187  174 174 174  167 166 167  166 165 166  158 157 158  157 156 157
++158 157 158  166 165 166  156 155 156  85 115 134  13 16 17  4 0 0
++4 0 0  4 0 0  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  6 6 6  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  6 6 6  6 6 6  13 16 17  60 73 81
++177 184 187  220 221 221  220 221 221  220 221 221  205 212 215  220 221 221
++220 221 221  205 212 215  220 221 221  244 246 246  244 246 246  205 212 215
++125 124 125  30 32 34  0 0 0  0 0 0  2 2 2  5 5 5
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  1 0 0
++37 38 37  131 129 131  205 212 215  220 221 221  193 200 203  174 174 174
++174 174 174  174 174 174  167 166 167  165 164 165  166 165 166  167 166 167
++158 157 158  125 124 125  37 38 37  4 0 0  4 0 0  4 0 0
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  4 3 3  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++26 28 28  125 124 125  205 212 215  220 221 221  220 221 221  220 221 221
++205 212 215  220 221 221  205 212 215  220 221 221  220 221 221  244 246 246
++244 246 246  190 197 201  60 74 84  16 19 21  4 0 0  0 0 0
++0 0 0  0 0 0  0 0 0  0 0 0  16 19 21  120 125 127
++177 184 187  220 221 221  205 212 215  177 184 187  174 174 174  177 184 187
++174 174 174  174 174 174  167 166 167  174 174 174  166 165 166  137 136 137
++60 73 81  13 16 17  4 0 0  4 0 0  4 3 3  6 6 6
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  5 5 5  4 3 3  6 6 6  4 0 0
++6 6 6  6 6 6  4 0 0  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  37 38 37  137 136 137  193 200 203  220 221 221
++220 221 221  205 212 215  220 221 221  205 212 215  205 212 215  220 221 221
++220 221 221  220 221 221  244 246 246  166 165 166  43 57 68  2 2 2
++0 0 0  4 0 0  16 19 21  60 73 81  157 156 157  202 210 214
++220 221 221  193 200 203  177 184 187  177 184 187  177 184 187  174 174 174
++174 174 174  174 174 174  174 174 174  157 156 157  60 74 84  24 26 27
++4 0 0  4 0 0  4 0 0  6 6 6  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  4 3 3  5 5 5  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  6 6 6  4 0 0
++4 0 0  4 0 0  6 6 6  24 26 27  60 73 81  167 166 167
++220 221 221  220 221 221  220 221 221  205 212 215  205 212 215  205 212 215
++205 212 215  220 221 221  220 221 221  220 221 221  205 212 215  137 136 137
++60 74 84  125 124 125  137 136 137  190 197 201  220 221 221  193 200 203
++177 184 187  177 184 187  177 184 187  174 174 174  174 174 174  177 184 187
++190 197 201  174 174 174  125 124 125  37 38 37  6 6 6  4 0 0
++4 0 0  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  4 3 3  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  4 0 0  4 0 0  6 6 6  6 6 6
++125 124 125  193 200 203  244 246 246  220 221 221  205 212 215  205 212 215
++205 212 215  193 200 203  205 212 215  205 212 215  220 221 221  220 221 221
++193 200 203  193 200 203  205 212 215  193 200 203  193 200 203  177 184 187
++190 197 201  190 197 201  174 174 174  190 197 201  193 200 203  190 197 201
++153 152 153  60 73 81  4 0 0  4 0 0  4 0 0  3 2 2
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  4 3 3
++6 6 6  4 3 3  4 3 3  4 3 3  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  4 0 0  4 0 0
++4 0 0  26 28 28  131 129 131  220 221 221  244 246 246  220 221 221
++205 212 215  193 200 203  205 212 215  193 200 203  193 200 203  205 212 215
++220 221 221  193 200 203  193 200 203  193 200 203  190 197 201  174 174 174
++174 174 174  190 197 201  193 200 203  193 200 203  167 166 167  125 124 125
++6 6 6  4 0 0  4 0 0  4 3 3  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++5 5 5  4 3 3  5 5 5  6 6 6  4 3 3  5 5 5
++6 6 6  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++4 0 0  4 0 0  6 6 6  41 54 63  158 157 158  220 221 221
++220 221 221  220 221 221  193 200 203  193 200 203  193 200 203  190 197 201
++190 197 201  190 197 201  190 197 201  190 197 201  174 174 174  193 200 203
++193 200 203  220 221 221  174 174 174  125 124 125  37 38 37  4 0 0
++4 0 0  4 3 3  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  4 3 3  4 3 3  5 5 5
++4 3 3  6 6 6  5 5 5  4 3 3  6 6 6  6 6 6
++6 6 6  6 6 6  4 0 0  4 0 0  13 16 17  60 73 81
++174 174 174  220 221 221  220 221 221  205 212 215  190 197 201  174 174 174
++193 200 203  174 174 174  190 197 201  174 174 174  193 200 203  220 221 221
++193 200 203  131 129 131  37 38 37  6 6 6  4 0 0  4 0 0
++6 6 6  6 6 6  4 3 3  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
++5 5 5  4 3 3  4 3 3  5 5 5  4 3 3  4 3 3
++5 5 5  6 6 6  6 6 6  4 0 0  6 6 6  6 6 6
++6 6 6  125 124 125  174 174 174  220 221 221  220 221 221  193 200 203
++193 200 203  193 200 203  193 200 203  193 200 203  220 221 221  158 157 158
++60 73 81  6 6 6  4 0 0  4 0 0  5 5 5  6 6 6
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  5 5 5  4 3 3  5 5 5  4 3 3
++5 5 5  5 5 5  6 6 6  6 6 6  4 0 0  4 0 0
++4 0 0  4 0 0  26 28 28  125 124 125  174 174 174  193 200 203
++193 200 203  174 174 174  193 200 203  167 166 167  125 124 125  6 6 6
++6 6 6  6 6 6  4 0 0  6 6 6  6 6 6  5 5 5
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++4 3 3  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++6 6 6  4 0 0  4 0 0  6 6 6  37 38 37  125 124 125
++153 152 153  131 129 131  125 124 125  37 38 37  6 6 6  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  4 3 3  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  5 5 5  4 3 3  5 5 5  4 3 3
++6 6 6  6 6 6  4 0 0  4 0 0  6 6 6  6 6 6
++24 26 27  24 26 27  6 6 6  6 6 6  6 6 6  4 0 0
++6 6 6  6 6 6  4 0 0  6 6 6  5 5 5  4 3 3
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  4 3 3  5 5 5  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++6 6 6  6 6 6  6 6 6  4 0 0  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  4 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  5 5 5
++5 5 5  5 5 5  4 0 0  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  6 6 6  4 0 0  6 6 6  4 0 0
++6 6 6  4 3 3  5 5 5  4 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++4 3 3  6 6 6  4 3 3  6 6 6  6 6 6  6 6 6
++4 0 0  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++6 6 6  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  5 5 5  4 0 0  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  4 0 0  6 6 6
++4 3 3  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  5 5 5  6 6 6  4 3 3
++4 3 3  6 6 6  6 6 6  4 3 3  6 6 6  4 3 3
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  6 6 6
++5 5 5  4 3 3  4 3 3  4 3 3  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  4 3 3
++5 5 5  4 3 3  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
+diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
+--- linux-3.0.4/drivers/video/udlfb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/udlfb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data 
  		dlfb_urb_completion(urb);
  
@@ -33640,9 +36352,9 @@ diff -urNp linux-3.0.3/drivers/video/udlfb.c linux-3.0.3/drivers/video/udlfb.c
  
  	return count;
  }
-diff -urNp linux-3.0.3/drivers/video/uvesafb.c linux-3.0.3/drivers/video/uvesafb.c
---- linux-3.0.3/drivers/video/uvesafb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/uvesafb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/uvesafb.c linux-3.0.4/drivers/video/uvesafb.c
+--- linux-3.0.4/drivers/video/uvesafb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/uvesafb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -33718,9 +36430,9 @@ diff -urNp linux-3.0.3/drivers/video/uvesafb.c linux-3.0.3/drivers/video/uvesafb
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-3.0.3/drivers/video/vesafb.c linux-3.0.3/drivers/video/vesafb.c
---- linux-3.0.3/drivers/video/vesafb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/vesafb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/vesafb.c linux-3.0.4/drivers/video/vesafb.c
+--- linux-3.0.4/drivers/video/vesafb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/vesafb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -33823,9 +36535,9 @@ diff -urNp linux-3.0.3/drivers/video/vesafb.c linux-3.0.3/drivers/video/vesafb.c
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-3.0.3/drivers/video/via/via_clock.h linux-3.0.3/drivers/video/via/via_clock.h
---- linux-3.0.3/drivers/video/via/via_clock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/via/via_clock.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/via/via_clock.h linux-3.0.4/drivers/video/via/via_clock.h
+--- linux-3.0.4/drivers/video/via/via_clock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/via/via_clock.h	2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@ struct via_clock {
  
  	void (*set_engine_pll_state)(u8 state);
@@ -33835,9 +36547,9 @@ diff -urNp linux-3.0.3/drivers/video/via/via_clock.h linux-3.0.3/drivers/video/v
  
  
  static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff -urNp linux-3.0.3/drivers/virtio/virtio_balloon.c linux-3.0.3/drivers/virtio/virtio_balloon.c
---- linux-3.0.3/drivers/virtio/virtio_balloon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/virtio/virtio_balloon.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/virtio/virtio_balloon.c linux-3.0.4/drivers/virtio/virtio_balloon.c
+--- linux-3.0.4/drivers/virtio/virtio_balloon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/virtio/virtio_balloon.c	2011-08-23 21:48:14.000000000 -0400
 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct 
  	struct sysinfo i;
  	int idx = 0;
@@ -33847,9 +36559,9 @@ diff -urNp linux-3.0.3/drivers/virtio/virtio_balloon.c linux-3.0.3/drivers/virti
  	all_vm_events(events);
  	si_meminfo(&i);
  
-diff -urNp linux-3.0.3/fs/9p/vfs_inode.c linux-3.0.3/fs/9p/vfs_inode.c
---- linux-3.0.3/fs/9p/vfs_inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/9p/vfs_inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/9p/vfs_inode.c linux-3.0.4/fs/9p/vfs_inode.c
+--- linux-3.0.4/fs/9p/vfs_inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/9p/vfs_inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -33859,9 +36571,9 @@ diff -urNp linux-3.0.3/fs/9p/vfs_inode.c linux-3.0.3/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-3.0.3/fs/aio.c linux-3.0.3/fs/aio.c
---- linux-3.0.3/fs/aio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/aio.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/aio.c linux-3.0.4/fs/aio.c
+--- linux-3.0.4/fs/aio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/aio.c	2011-08-23 21:48:14.000000000 -0400
 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx 
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -33910,9 +36622,9 @@ diff -urNp linux-3.0.3/fs/aio.c linux-3.0.3/fs/aio.c
  	kiocb->ki_nr_segs = kiocb->ki_nbytes;
  	kiocb->ki_cur_seg = 0;
  	/* ki_nbytes/left now reflect bytes instead of segs */
-diff -urNp linux-3.0.3/fs/attr.c linux-3.0.3/fs/attr.c
---- linux-3.0.3/fs/attr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/attr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/attr.c linux-3.0.4/fs/attr.c
+--- linux-3.0.4/fs/attr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/attr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
@@ -33921,10 +36633,10 @@ diff -urNp linux-3.0.3/fs/attr.c linux-3.0.3/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-3.0.3/fs/befs/linuxvfs.c linux-3.0.3/fs/befs/linuxvfs.c
---- linux-3.0.3/fs/befs/linuxvfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/befs/linuxvfs.c	2011-08-23 21:47:56.000000000 -0400
-@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry 
+diff -urNp linux-3.0.4/fs/befs/linuxvfs.c linux-3.0.4/fs/befs/linuxvfs.c
+--- linux-3.0.4/fs/befs/linuxvfs.c	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/fs/befs/linuxvfs.c	2011-08-29 23:26:27.000000000 -0400
+@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
  	if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
@@ -33933,9 +36645,9 @@ diff -urNp linux-3.0.3/fs/befs/linuxvfs.c linux-3.0.3/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-3.0.3/fs/binfmt_aout.c linux-3.0.3/fs/binfmt_aout.c
---- linux-3.0.3/fs/binfmt_aout.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/binfmt_aout.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/binfmt_aout.c linux-3.0.4/fs/binfmt_aout.c
+--- linux-3.0.4/fs/binfmt_aout.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/binfmt_aout.c	2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -34012,9 +36724,9 @@ diff -urNp linux-3.0.3/fs/binfmt_aout.c linux-3.0.3/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urNp linux-3.0.3/fs/binfmt_elf.c linux-3.0.3/fs/binfmt_elf.c
---- linux-3.0.3/fs/binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/binfmt_elf.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
+--- linux-3.0.4/fs/binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/binfmt_elf.c	2011-08-23 21:48:14.000000000 -0400
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump	NULL
  #endif
@@ -34718,9 +37430,9 @@ diff -urNp linux-3.0.3/fs/binfmt_elf.c linux-3.0.3/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-3.0.3/fs/binfmt_flat.c linux-3.0.3/fs/binfmt_flat.c
---- linux-3.0.3/fs/binfmt_flat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/binfmt_flat.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/binfmt_flat.c linux-3.0.4/fs/binfmt_flat.c
+--- linux-3.0.4/fs/binfmt_flat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/binfmt_flat.c	2011-08-23 21:47:56.000000000 -0400
 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
@@ -34753,9 +37465,9 @@ diff -urNp linux-3.0.3/fs/binfmt_flat.c linux-3.0.3/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-3.0.3/fs/bio.c linux-3.0.3/fs/bio.c
---- linux-3.0.3/fs/bio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/bio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/bio.c linux-3.0.4/fs/bio.c
+--- linux-3.0.4/fs/bio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/bio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
  	const int read = bio_data_dir(bio) == READ;
  	struct bio_map_data *bmd = bio->bi_private;
@@ -34765,9 +37477,9 @@ diff -urNp linux-3.0.3/fs/bio.c linux-3.0.3/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-3.0.3/fs/block_dev.c linux-3.0.3/fs/block_dev.c
---- linux-3.0.3/fs/block_dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/block_dev.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/block_dev.c linux-3.0.4/fs/block_dev.c
+--- linux-3.0.4/fs/block_dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/block_dev.c	2011-08-23 21:47:56.000000000 -0400
 @@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
  	else if (bdev->bd_contains == bdev)
  		return true;  	 /* is a whole device which isn't held */
@@ -34777,9 +37489,9 @@ diff -urNp linux-3.0.3/fs/block_dev.c linux-3.0.3/fs/block_dev.c
  		return true; 	 /* is a partition of a device that is being partitioned */
  	else if (whole->bd_holder != NULL)
  		return false;	 /* is a partition of a held device */
-diff -urNp linux-3.0.3/fs/btrfs/ctree.c linux-3.0.3/fs/btrfs/ctree.c
---- linux-3.0.3/fs/btrfs/ctree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/ctree.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/ctree.c linux-3.0.4/fs/btrfs/ctree.c
+--- linux-3.0.4/fs/btrfs/ctree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/ctree.c	2011-08-23 21:47:56.000000000 -0400
 @@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
@@ -34796,9 +37508,9 @@ diff -urNp linux-3.0.3/fs/btrfs/ctree.c linux-3.0.3/fs/btrfs/ctree.c
  			parent_start = 0;
  
  		WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff -urNp linux-3.0.3/fs/btrfs/inode.c linux-3.0.3/fs/btrfs/inode.c
---- linux-3.0.3/fs/btrfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
+--- linux-3.0.4/fs/btrfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/inode.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6895,7 +6895,7 @@ fail:
  	return -ENOMEM;
  }
@@ -34823,9 +37535,9 @@ diff -urNp linux-3.0.3/fs/btrfs/inode.c linux-3.0.3/fs/btrfs/inode.c
  /*
   * If a file is moved, it will inherit the cow and compression flags of the new
   * directory.
-diff -urNp linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3/fs/btrfs/ioctl.c
---- linux-3.0.3/fs/btrfs/ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/ioctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
+--- linux-3.0.4/fs/btrfs/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/ioctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
@@ -34850,9 +37562,9 @@ diff -urNp linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3/fs/btrfs/ioctl.c
  		}
  		up_read(&info->groups_sem);
  	}
-diff -urNp linux-3.0.3/fs/btrfs/relocation.c linux-3.0.3/fs/btrfs/relocation.c
---- linux-3.0.3/fs/btrfs/relocation.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/relocation.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/relocation.c linux-3.0.4/fs/btrfs/relocation.c
+--- linux-3.0.4/fs/btrfs/relocation.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/relocation.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
@@ -34862,9 +37574,9 @@ diff -urNp linux-3.0.3/fs/btrfs/relocation.c linux-3.0.3/fs/btrfs/relocation.c
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-3.0.3/fs/cachefiles/bind.c linux-3.0.3/fs/cachefiles/bind.c
---- linux-3.0.3/fs/cachefiles/bind.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/bind.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/bind.c linux-3.0.4/fs/cachefiles/bind.c
+--- linux-3.0.4/fs/cachefiles/bind.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/bind.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -34881,9 +37593,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/bind.c linux-3.0.3/fs/cachefiles/bind.c
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-3.0.3/fs/cachefiles/daemon.c linux-3.0.3/fs/cachefiles/daemon.c
---- linux-3.0.3/fs/cachefiles/daemon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/daemon.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/daemon.c linux-3.0.4/fs/cachefiles/daemon.c
+--- linux-3.0.4/fs/cachefiles/daemon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/daemon.c	2011-08-23 21:47:56.000000000 -0400
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
  	if (n > buflen)
  		return -EMSGSIZE;
@@ -34920,9 +37632,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/daemon.c linux-3.0.3/fs/cachefiles/daemon.c
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-3.0.3/fs/cachefiles/internal.h linux-3.0.3/fs/cachefiles/internal.h
---- linux-3.0.3/fs/cachefiles/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/internal.h linux-3.0.4/fs/cachefiles/internal.h
+--- linux-3.0.4/fs/cachefiles/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -57,7 +57,7 @@ struct cachefiles_cache {
  	wait_queue_head_t		daemon_pollwq;	/* poll waitqueue for daemon */
  	struct rb_root			active_nodes;	/* active nodes (can't be culled) */
@@ -34957,9 +37669,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/internal.h linux-3.0.3/fs/cachefiles/intern
  }
  
  #else
-diff -urNp linux-3.0.3/fs/cachefiles/namei.c linux-3.0.3/fs/cachefiles/namei.c
---- linux-3.0.3/fs/cachefiles/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/namei.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/namei.c linux-3.0.4/fs/cachefiles/namei.c
+--- linux-3.0.4/fs/cachefiles/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/namei.c	2011-08-23 21:47:56.000000000 -0400
 @@ -318,7 +318,7 @@ try_again:
  	/* first step is to make up a grave dentry in the graveyard */
  	sprintf(nbuffer, "%08x%08x",
@@ -34969,9 +37681,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/namei.c linux-3.0.3/fs/cachefiles/namei.c
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-3.0.3/fs/cachefiles/proc.c linux-3.0.3/fs/cachefiles/proc.c
---- linux-3.0.3/fs/cachefiles/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/proc.c linux-3.0.4/fs/cachefiles/proc.c
+--- linux-3.0.4/fs/cachefiles/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/proc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -34998,9 +37710,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/proc.c linux-3.0.3/fs/cachefiles/proc.c
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff -urNp linux-3.0.3/fs/cachefiles/rdwr.c linux-3.0.3/fs/cachefiles/rdwr.c
---- linux-3.0.3/fs/cachefiles/rdwr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/rdwr.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/rdwr.c linux-3.0.4/fs/cachefiles/rdwr.c
+--- linux-3.0.4/fs/cachefiles/rdwr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/rdwr.c	2011-08-23 21:47:56.000000000 -0400
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -35010,9 +37722,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/rdwr.c linux-3.0.3/fs/cachefiles/rdwr.c
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-3.0.3/fs/ceph/dir.c linux-3.0.3/fs/ceph/dir.c
---- linux-3.0.3/fs/ceph/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ceph/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ceph/dir.c linux-3.0.4/fs/ceph/dir.c
+--- linux-3.0.4/fs/ceph/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ceph/dir.c	2011-08-23 21:47:56.000000000 -0400
 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
  	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -35022,9 +37734,9 @@ diff -urNp linux-3.0.3/fs/ceph/dir.c linux-3.0.3/fs/ceph/dir.c
  	int err;
  	u32 ftype;
  	struct ceph_mds_reply_info_parsed *rinfo;
-diff -urNp linux-3.0.3/fs/cifs/cifs_debug.c linux-3.0.3/fs/cifs/cifs_debug.c
---- linux-3.0.3/fs/cifs/cifs_debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/cifs_debug.c	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/cifs_debug.c linux-3.0.4/fs/cifs/cifs_debug.c
+--- linux-3.0.4/fs/cifs/cifs_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/cifs_debug.c	2011-08-25 17:18:05.000000000 -0400
 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
  
  	if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
@@ -35154,9 +37866,9 @@ diff -urNp linux-3.0.3/fs/cifs/cifs_debug.c linux-3.0.3/fs/cifs/cifs_debug.c
  			}
  		}
  	}
-diff -urNp linux-3.0.3/fs/cifs/cifsfs.c linux-3.0.3/fs/cifs/cifsfs.c
---- linux-3.0.3/fs/cifs/cifsfs.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/cifs/cifsfs.c	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
+--- linux-3.0.4/fs/cifs/cifsfs.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/cifs/cifsfs.c	2011-08-25 17:18:05.000000000 -0400
 @@ -994,7 +994,7 @@ cifs_init_request_bufs(void)
  	cifs_req_cachep = kmem_cache_create("cifs_request",
  					    CIFSMaxBufSize +
@@ -35186,9 +37898,9 @@ diff -urNp linux-3.0.3/fs/cifs/cifsfs.c linux-3.0.3/fs/cifs/cifsfs.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	atomic_set(&midCount, 0);
-diff -urNp linux-3.0.3/fs/cifs/cifsglob.h linux-3.0.3/fs/cifs/cifsglob.h
---- linux-3.0.3/fs/cifs/cifsglob.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/cifsglob.h	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
+--- linux-3.0.4/fs/cifs/cifsglob.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/cifsglob.h	2011-08-25 17:18:05.000000000 -0400
 @@ -381,28 +381,28 @@ struct cifs_tcon {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
@@ -35260,9 +37972,9 @@ diff -urNp linux-3.0.3/fs/cifs/cifsglob.h linux-3.0.3/fs/cifs/cifsglob.h
  #endif
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
-diff -urNp linux-3.0.3/fs/cifs/link.c linux-3.0.3/fs/cifs/link.c
---- linux-3.0.3/fs/cifs/link.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/link.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/link.c linux-3.0.4/fs/cifs/link.c
+--- linux-3.0.4/fs/cifs/link.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/link.c	2011-08-23 21:47:56.000000000 -0400
 @@ -587,7 +587,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -35272,9 +37984,9 @@ diff -urNp linux-3.0.3/fs/cifs/link.c linux-3.0.3/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-3.0.3/fs/cifs/misc.c linux-3.0.3/fs/cifs/misc.c
---- linux-3.0.3/fs/cifs/misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/misc.c	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/misc.c linux-3.0.4/fs/cifs/misc.c
+--- linux-3.0.4/fs/cifs/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/misc.c	2011-08-25 17:18:05.000000000 -0400
 @@ -156,7 +156,7 @@ cifs_buf_get(void)
  		memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
  		atomic_inc(&bufAllocCount);
@@ -35293,9 +38005,9 @@ diff -urNp linux-3.0.3/fs/cifs/misc.c linux-3.0.3/fs/cifs/misc.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	}
-diff -urNp linux-3.0.3/fs/coda/cache.c linux-3.0.3/fs/coda/cache.c
---- linux-3.0.3/fs/coda/cache.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/coda/cache.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/coda/cache.c linux-3.0.4/fs/coda/cache.c
+--- linux-3.0.4/fs/coda/cache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/coda/cache.c	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -35340,9 +38052,9 @@ diff -urNp linux-3.0.3/fs/coda/cache.c linux-3.0.3/fs/coda/cache.c
  	spin_unlock(&cii->c_lock);
  
  	return hit;
-diff -urNp linux-3.0.3/fs/compat_binfmt_elf.c linux-3.0.3/fs/compat_binfmt_elf.c
---- linux-3.0.3/fs/compat_binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/compat_binfmt_elf.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/compat_binfmt_elf.c linux-3.0.4/fs/compat_binfmt_elf.c
+--- linux-3.0.4/fs/compat_binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/compat_binfmt_elf.c	2011-08-23 21:47:56.000000000 -0400
 @@ -30,11 +30,13 @@
  #undef	elf_phdr
  #undef	elf_shdr
@@ -35357,9 +38069,9 @@ diff -urNp linux-3.0.3/fs/compat_binfmt_elf.c linux-3.0.3/fs/compat_binfmt_elf.c
  #define elf_addr_t	Elf32_Addr
  
  /*
-diff -urNp linux-3.0.3/fs/compat.c linux-3.0.3/fs/compat.c
---- linux-3.0.3/fs/compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/compat.c	2011-08-23 22:49:33.000000000 -0400
+diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
+--- linux-3.0.4/fs/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/compat.c	2011-08-23 22:49:33.000000000 -0400
 @@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int
  		goto out;
  
@@ -35459,9 +38171,9 @@ diff -urNp linux-3.0.3/fs/compat.c linux-3.0.3/fs/compat.c
  	if (n < 0)
  		goto out_nofds;
  
-diff -urNp linux-3.0.3/fs/compat_ioctl.c linux-3.0.3/fs/compat_ioctl.c
---- linux-3.0.3/fs/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/compat_ioctl.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
+--- linux-3.0.4/fs/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/compat_ioctl.c	2011-08-23 21:47:56.000000000 -0400
 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
  	err  = get_user(palp, &up->palette);
@@ -35482,9 +38194,9 @@ diff -urNp linux-3.0.3/fs/compat_ioctl.c linux-3.0.3/fs/compat_ioctl.c
  	if (a > b)
  		return 1;
  	if (a < b)
-diff -urNp linux-3.0.3/fs/configfs/dir.c linux-3.0.3/fs/configfs/dir.c
---- linux-3.0.3/fs/configfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/configfs/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/configfs/dir.c linux-3.0.4/fs/configfs/dir.c
+--- linux-3.0.4/fs/configfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/configfs/dir.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file 
  			}
  			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -35509,9 +38221,9 @@ diff -urNp linux-3.0.3/fs/configfs/dir.c linux-3.0.3/fs/configfs/dir.c
  
  				/*
  				 * We'll have a dentry and an inode for
-diff -urNp linux-3.0.3/fs/dcache.c linux-3.0.3/fs/dcache.c
---- linux-3.0.3/fs/dcache.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/dcache.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/dcache.c linux-3.0.4/fs/dcache.c
+--- linux-3.0.4/fs/dcache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/dcache.c	2011-08-23 21:47:56.000000000 -0400
 @@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
  	mempages -= reserve;
  
@@ -35521,9 +38233,9 @@ diff -urNp linux-3.0.3/fs/dcache.c linux-3.0.3/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-3.0.3/fs/ecryptfs/inode.c linux-3.0.3/fs/ecryptfs/inode.c
---- linux-3.0.3/fs/ecryptfs/inode.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/ecryptfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ecryptfs/inode.c linux-3.0.4/fs/ecryptfs/inode.c
+--- linux-3.0.4/fs/ecryptfs/inode.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/ecryptfs/inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -35551,9 +38263,9 @@ diff -urNp linux-3.0.3/fs/ecryptfs/inode.c linux-3.0.3/fs/ecryptfs/inode.c
  	if (!IS_ERR(buf)) {
  		/* Free the char* */
  		kfree(buf);
-diff -urNp linux-3.0.3/fs/ecryptfs/miscdev.c linux-3.0.3/fs/ecryptfs/miscdev.c
---- linux-3.0.3/fs/ecryptfs/miscdev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ecryptfs/miscdev.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ecryptfs/miscdev.c linux-3.0.4/fs/ecryptfs/miscdev.c
+--- linux-3.0.4/fs/ecryptfs/miscdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ecryptfs/miscdev.c	2011-08-23 21:47:56.000000000 -0400
 @@ -328,7 +328,7 @@ check_list:
  		goto out_unlock_msg_ctx;
  	i = 5;
@@ -35563,9 +38275,9 @@ diff -urNp linux-3.0.3/fs/ecryptfs/miscdev.c linux-3.0.3/fs/ecryptfs/miscdev.c
  			goto out_unlock_msg_ctx;
  		i += packet_length_size;
  		if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
---- linux-3.0.3/fs/exec.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/exec.c	2011-08-25 17:26:58.000000000 -0400
+diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
+--- linux-3.0.4/fs/exec.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/exec.c	2011-08-25 17:26:58.000000000 -0400
 @@ -55,12 +55,24 @@
  #include <linux/pipe_fs_i.h>
  #include <linux/oom.h>
@@ -36205,9 +38917,9 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
  fail_unlock:
  	kfree(cn.corename);
  fail_corename:
-diff -urNp linux-3.0.3/fs/ext2/balloc.c linux-3.0.3/fs/ext2/balloc.c
---- linux-3.0.3/fs/ext2/balloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ext2/balloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext2/balloc.c linux-3.0.4/fs/ext2/balloc.c
+--- linux-3.0.4/fs/ext2/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ext2/balloc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -36217,9 +38929,9 @@ diff -urNp linux-3.0.3/fs/ext2/balloc.c linux-3.0.3/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-3.0.3/fs/ext3/balloc.c linux-3.0.3/fs/ext3/balloc.c
---- linux-3.0.3/fs/ext3/balloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ext3/balloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext3/balloc.c linux-3.0.4/fs/ext3/balloc.c
+--- linux-3.0.4/fs/ext3/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ext3/balloc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -36229,9 +38941,9 @@ diff -urNp linux-3.0.3/fs/ext3/balloc.c linux-3.0.3/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-3.0.3/fs/ext4/balloc.c linux-3.0.3/fs/ext4/balloc.c
---- linux-3.0.3/fs/ext4/balloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ext4/balloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext4/balloc.c linux-3.0.4/fs/ext4/balloc.c
+--- linux-3.0.4/fs/ext4/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ext4/balloc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
  	/* Hm, nope.  Are (enough) root reserved blocks available? */
  	if (sbi->s_resuid == current_fsuid() ||
@@ -36243,9 +38955,9 @@ diff -urNp linux-3.0.3/fs/ext4/balloc.c linux-3.0.3/fs/ext4/balloc.c
  
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
-diff -urNp linux-3.0.3/fs/ext4/ext4.h linux-3.0.3/fs/ext4/ext4.h
---- linux-3.0.3/fs/ext4/ext4.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/ext4/ext4.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext4/ext4.h linux-3.0.4/fs/ext4/ext4.h
+--- linux-3.0.4/fs/ext4/ext4.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/ext4/ext4.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1177,19 +1177,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
@@ -36276,9 +38988,9 @@ diff -urNp linux-3.0.3/fs/ext4/ext4.h linux-3.0.3/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-3.0.3/fs/ext4/mballoc.c linux-3.0.3/fs/ext4/mballoc.c
---- linux-3.0.3/fs/ext4/mballoc.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/ext4/mballoc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
+--- linux-3.0.4/fs/ext4/mballoc.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/ext4/mballoc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
@@ -36401,9 +39113,9 @@ diff -urNp linux-3.0.3/fs/ext4/mballoc.c linux-3.0.3/fs/ext4/mballoc.c
  	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
  	return 0;
-diff -urNp linux-3.0.3/fs/fcntl.c linux-3.0.3/fs/fcntl.c
---- linux-3.0.3/fs/fcntl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fcntl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
+--- linux-3.0.4/fs/fcntl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fcntl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -36441,9 +39153,9 @@ diff -urNp linux-3.0.3/fs/fcntl.c linux-3.0.3/fs/fcntl.c
  		));
  
  	fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-3.0.3/fs/fifo.c linux-3.0.3/fs/fifo.c
---- linux-3.0.3/fs/fifo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fifo.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fifo.c linux-3.0.4/fs/fifo.c
+--- linux-3.0.4/fs/fifo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fifo.c	2011-08-23 21:47:56.000000000 -0400
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
@@ -36514,9 +39226,9 @@ diff -urNp linux-3.0.3/fs/fifo.c linux-3.0.3/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-3.0.3/fs/file.c linux-3.0.3/fs/file.c
---- linux-3.0.3/fs/file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/file.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/file.c linux-3.0.4/fs/file.c
+--- linux-3.0.4/fs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/file.c	2011-08-23 21:48:14.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -36533,9 +39245,9 @@ diff -urNp linux-3.0.3/fs/file.c linux-3.0.3/fs/file.c
  	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff -urNp linux-3.0.3/fs/filesystems.c linux-3.0.3/fs/filesystems.c
---- linux-3.0.3/fs/filesystems.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/filesystems.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/filesystems.c linux-3.0.4/fs/filesystems.c
+--- linux-3.0.4/fs/filesystems.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/filesystems.c	2011-08-23 21:48:14.000000000 -0400
 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
@@ -36549,9 +39261,9 @@ diff -urNp linux-3.0.3/fs/filesystems.c linux-3.0.3/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-3.0.3/fs/fscache/cookie.c linux-3.0.3/fs/fscache/cookie.c
---- linux-3.0.3/fs/fscache/cookie.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/cookie.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/cookie.c linux-3.0.4/fs/fscache/cookie.c
+--- linux-3.0.4/fs/fscache/cookie.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/cookie.c	2011-08-23 21:47:56.000000000 -0400
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
  	       parent ? (char *) parent->def->name : "<no-parent>",
  	       def->name, netfs_data);
@@ -36670,9 +39382,9 @@ diff -urNp linux-3.0.3/fs/fscache/cookie.c linux-3.0.3/fs/fscache/cookie.c
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff -urNp linux-3.0.3/fs/fscache/internal.h linux-3.0.3/fs/fscache/internal.h
---- linux-3.0.3/fs/fscache/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/internal.h linux-3.0.4/fs/fscache/internal.h
+--- linux-3.0.4/fs/fscache/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
  extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
  extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -36876,9 +39588,9 @@ diff -urNp linux-3.0.3/fs/fscache/internal.h linux-3.0.3/fs/fscache/internal.h
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-3.0.3/fs/fscache/object.c linux-3.0.3/fs/fscache/object.c
---- linux-3.0.3/fs/fscache/object.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/object.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/object.c linux-3.0.4/fs/fscache/object.c
+--- linux-3.0.4/fs/fscache/object.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/object.c	2011-08-23 21:47:56.000000000 -0400
 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
  		/* update the object metadata on disk */
  	case FSCACHE_OBJECT_UPDATING:
@@ -36990,9 +39702,9 @@ diff -urNp linux-3.0.3/fs/fscache/object.c linux-3.0.3/fs/fscache/object.c
  		break;
  
  	default:
-diff -urNp linux-3.0.3/fs/fscache/operation.c linux-3.0.3/fs/fscache/operation.c
---- linux-3.0.3/fs/fscache/operation.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/operation.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/operation.c linux-3.0.4/fs/fscache/operation.c
+--- linux-3.0.4/fs/fscache/operation.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/operation.c	2011-08-23 21:47:56.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -37108,9 +39820,9 @@ diff -urNp linux-3.0.3/fs/fscache/operation.c linux-3.0.3/fs/fscache/operation.c
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-3.0.3/fs/fscache/page.c linux-3.0.3/fs/fscache/page.c
---- linux-3.0.3/fs/fscache/page.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/page.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/page.c linux-3.0.4/fs/fscache/page.c
+--- linux-3.0.4/fs/fscache/page.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/page.c	2011-08-23 21:47:56.000000000 -0400
 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
  	val = radix_tree_lookup(&cookie->stores, page->index);
  	if (!val) {
@@ -37494,9 +40206,9 @@ diff -urNp linux-3.0.3/fs/fscache/page.c linux-3.0.3/fs/fscache/page.c
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-3.0.3/fs/fscache/stats.c linux-3.0.3/fs/fscache/stats.c
---- linux-3.0.3/fs/fscache/stats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/stats.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/stats.c linux-3.0.4/fs/fscache/stats.c
+--- linux-3.0.4/fs/fscache/stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/stats.c	2011-08-23 21:47:56.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -37872,9 +40584,9 @@ diff -urNp linux-3.0.3/fs/fscache/stats.c linux-3.0.3/fs/fscache/stats.c
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-3.0.3/fs/fs_struct.c linux-3.0.3/fs/fs_struct.c
---- linux-3.0.3/fs/fs_struct.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fs_struct.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/fs_struct.c linux-3.0.4/fs/fs_struct.c
+--- linux-3.0.4/fs/fs_struct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fs_struct.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -37964,9 +40676,9 @@ diff -urNp linux-3.0.3/fs/fs_struct.c linux-3.0.3/fs/fs_struct.c
  		spin_unlock(&fs->lock);
  
  		task_unlock(current);
-diff -urNp linux-3.0.3/fs/fuse/cuse.c linux-3.0.3/fs/fuse/cuse.c
---- linux-3.0.3/fs/fuse/cuse.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fuse/cuse.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fuse/cuse.c linux-3.0.4/fs/fuse/cuse.c
+--- linux-3.0.4/fs/fuse/cuse.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fuse/cuse.c	2011-08-23 21:47:56.000000000 -0400
 @@ -586,10 +586,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -37984,9 +40696,9 @@ diff -urNp linux-3.0.3/fs/fuse/cuse.c linux-3.0.3/fs/fuse/cuse.c
  
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
-diff -urNp linux-3.0.3/fs/fuse/dev.c linux-3.0.3/fs/fuse/dev.c
---- linux-3.0.3/fs/fuse/dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fuse/dev.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fuse/dev.c linux-3.0.4/fs/fuse/dev.c
+--- linux-3.0.4/fs/fuse/dev.c	2011-08-29 23:26:14.000000000 -0400
++++ linux-3.0.4/fs/fuse/dev.c	2011-08-29 23:26:27.000000000 -0400
 @@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru
  	ret = 0;
  	pipe_lock(pipe);
@@ -37996,9 +40708,9 @@ diff -urNp linux-3.0.3/fs/fuse/dev.c linux-3.0.3/fs/fuse/dev.c
  		send_sig(SIGPIPE, current, 0);
  		if (!ret)
  			ret = -EPIPE;
-diff -urNp linux-3.0.3/fs/fuse/dir.c linux-3.0.3/fs/fuse/dir.c
---- linux-3.0.3/fs/fuse/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fuse/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fuse/dir.c linux-3.0.4/fs/fuse/dir.c
+--- linux-3.0.4/fs/fuse/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fuse/dir.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
@@ -38008,9 +40720,9 @@ diff -urNp linux-3.0.3/fs/fuse/dir.c linux-3.0.3/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-3.0.3/fs/gfs2/inode.c linux-3.0.3/fs/gfs2/inode.c
---- linux-3.0.3/fs/gfs2/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/gfs2/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/gfs2/inode.c linux-3.0.4/fs/gfs2/inode.c
+--- linux-3.0.4/fs/gfs2/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/gfs2/inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1525,7 +1525,7 @@ out:
  
  static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -38020,9 +40732,9 @@ diff -urNp linux-3.0.3/fs/gfs2/inode.c linux-3.0.3/fs/gfs2/inode.c
  	if (!IS_ERR(s))
  		kfree(s);
  }
-diff -urNp linux-3.0.3/fs/hfsplus/catalog.c linux-3.0.3/fs/hfsplus/catalog.c
---- linux-3.0.3/fs/hfsplus/catalog.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/catalog.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/catalog.c linux-3.0.4/fs/hfsplus/catalog.c
+--- linux-3.0.4/fs/hfsplus/catalog.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/catalog.c	2011-08-23 21:48:14.000000000 -0400
 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block 
  	int err;
  	u16 type;
@@ -38050,9 +40762,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/catalog.c linux-3.0.3/fs/hfsplus/catalog.c
  	dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
  		cnid, src_dir->i_ino, src_name->name,
  		dst_dir->i_ino, dst_name->name);
-diff -urNp linux-3.0.3/fs/hfsplus/dir.c linux-3.0.3/fs/hfsplus/dir.c
---- linux-3.0.3/fs/hfsplus/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/dir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/dir.c linux-3.0.4/fs/hfsplus/dir.c
+--- linux-3.0.4/fs/hfsplus/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/dir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
  	struct hfsplus_readdir_data *rd;
  	u16 type;
@@ -38062,9 +40774,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/dir.c linux-3.0.3/fs/hfsplus/dir.c
  	if (filp->f_pos >= inode->i_size)
  		return 0;
  
-diff -urNp linux-3.0.3/fs/hfsplus/inode.c linux-3.0.3/fs/hfsplus/inode.c
---- linux-3.0.3/fs/hfsplus/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
+--- linux-3.0.4/fs/hfsplus/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/inode.c	2011-08-23 21:48:14.000000000 -0400
 @@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode 
  	int res = 0;
  	u16 type;
@@ -38083,9 +40795,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/inode.c linux-3.0.3/fs/hfsplus/inode.c
  	if (HFSPLUS_IS_RSRC(inode))
  		main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff -urNp linux-3.0.3/fs/hfsplus/ioctl.c linux-3.0.3/fs/hfsplus/ioctl.c
---- linux-3.0.3/fs/hfsplus/ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/ioctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/ioctl.c linux-3.0.4/fs/hfsplus/ioctl.c
+--- linux-3.0.4/fs/hfsplus/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/ioctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
  	struct hfsplus_cat_file *file;
  	int res;
@@ -38104,9 +40816,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/ioctl.c linux-3.0.3/fs/hfsplus/ioctl.c
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-diff -urNp linux-3.0.3/fs/hfsplus/super.c linux-3.0.3/fs/hfsplus/super.c
---- linux-3.0.3/fs/hfsplus/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/super.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/super.c linux-3.0.4/fs/hfsplus/super.c
+--- linux-3.0.4/fs/hfsplus/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/super.c	2011-08-23 21:48:14.000000000 -0400
 @@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
  	struct nls_table *nls = NULL;
  	int err;
@@ -38116,9 +40828,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/super.c linux-3.0.3/fs/hfsplus/super.c
  	err = -EINVAL;
  	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
  	if (!sbi)
-diff -urNp linux-3.0.3/fs/hugetlbfs/inode.c linux-3.0.3/fs/hugetlbfs/inode.c
---- linux-3.0.3/fs/hugetlbfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hugetlbfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hugetlbfs/inode.c linux-3.0.4/fs/hugetlbfs/inode.c
+--- linux-3.0.4/fs/hugetlbfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hugetlbfs/inode.c	2011-08-23 21:48:14.000000000 -0400
 @@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
@@ -38128,9 +40840,9 @@ diff -urNp linux-3.0.3/fs/hugetlbfs/inode.c linux-3.0.3/fs/hugetlbfs/inode.c
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-3.0.3/fs/inode.c linux-3.0.3/fs/inode.c
---- linux-3.0.3/fs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/inode.c linux-3.0.4/fs/inode.c
+--- linux-3.0.4/fs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
@@ -38142,9 +40854,9 @@ diff -urNp linux-3.0.3/fs/inode.c linux-3.0.3/fs/inode.c
  
  		res = next - LAST_INO_BATCH;
  	}
-diff -urNp linux-3.0.3/fs/jbd/checkpoint.c linux-3.0.3/fs/jbd/checkpoint.c
---- linux-3.0.3/fs/jbd/checkpoint.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jbd/checkpoint.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jbd/checkpoint.c linux-3.0.4/fs/jbd/checkpoint.c
+--- linux-3.0.4/fs/jbd/checkpoint.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jbd/checkpoint.c	2011-08-23 21:48:14.000000000 -0400
 @@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
  	tid_t this_tid;
  	int result;
@@ -38154,9 +40866,9 @@ diff -urNp linux-3.0.3/fs/jbd/checkpoint.c linux-3.0.3/fs/jbd/checkpoint.c
  	jbd_debug(1, "Start checkpoint\n");
  
  	/*
-diff -urNp linux-3.0.3/fs/jffs2/compr_rtime.c linux-3.0.3/fs/jffs2/compr_rtime.c
---- linux-3.0.3/fs/jffs2/compr_rtime.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/compr_rtime.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/compr_rtime.c linux-3.0.4/fs/jffs2/compr_rtime.c
+--- linux-3.0.4/fs/jffs2/compr_rtime.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/compr_rtime.c	2011-08-23 21:48:14.000000000 -0400
 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
  	int outpos = 0;
  	int pos=0;
@@ -38175,9 +40887,9 @@ diff -urNp linux-3.0.3/fs/jffs2/compr_rtime.c linux-3.0.3/fs/jffs2/compr_rtime.c
  	memset(positions,0,sizeof(positions));
  
  	while (outpos<destlen) {
-diff -urNp linux-3.0.3/fs/jffs2/compr_rubin.c linux-3.0.3/fs/jffs2/compr_rubin.c
---- linux-3.0.3/fs/jffs2/compr_rubin.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/compr_rubin.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/compr_rubin.c linux-3.0.4/fs/jffs2/compr_rubin.c
+--- linux-3.0.4/fs/jffs2/compr_rubin.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/compr_rubin.c	2011-08-23 21:48:14.000000000 -0400
 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
  	int ret;
  	uint32_t mysrclen, mydstlen;
@@ -38187,9 +40899,9 @@ diff -urNp linux-3.0.3/fs/jffs2/compr_rubin.c linux-3.0.3/fs/jffs2/compr_rubin.c
  	mysrclen = *sourcelen;
  	mydstlen = *dstlen - 8;
  
-diff -urNp linux-3.0.3/fs/jffs2/erase.c linux-3.0.3/fs/jffs2/erase.c
---- linux-3.0.3/fs/jffs2/erase.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/erase.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/erase.c linux-3.0.4/fs/jffs2/erase.c
+--- linux-3.0.4/fs/jffs2/erase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/erase.c	2011-08-23 21:47:56.000000000 -0400
 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -38200,9 +40912,9 @@ diff -urNp linux-3.0.3/fs/jffs2/erase.c linux-3.0.3/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-3.0.3/fs/jffs2/wbuf.c linux-3.0.3/fs/jffs2/wbuf.c
---- linux-3.0.3/fs/jffs2/wbuf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/wbuf.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/wbuf.c linux-3.0.4/fs/jffs2/wbuf.c
+--- linux-3.0.4/fs/jffs2/wbuf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/wbuf.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -38213,9 +40925,9 @@ diff -urNp linux-3.0.3/fs/jffs2/wbuf.c linux-3.0.3/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-3.0.3/fs/jffs2/xattr.c linux-3.0.3/fs/jffs2/xattr.c
---- linux-3.0.3/fs/jffs2/xattr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/xattr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/xattr.c linux-3.0.4/fs/jffs2/xattr.c
+--- linux-3.0.4/fs/jffs2/xattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/xattr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
  	BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -38225,9 +40937,9 @@ diff -urNp linux-3.0.3/fs/jffs2/xattr.c linux-3.0.3/fs/jffs2/xattr.c
  	/* Phase.1 : Merge same xref */
  	for (i=0; i < XREF_TMPHASH_SIZE; i++)
  		xref_tmphash[i] = NULL;
-diff -urNp linux-3.0.3/fs/jfs/super.c linux-3.0.3/fs/jfs/super.c
---- linux-3.0.3/fs/jfs/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jfs/super.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/jfs/super.c linux-3.0.4/fs/jfs/super.c
+--- linux-3.0.4/fs/jfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jfs/super.c	2011-08-23 21:47:56.000000000 -0400
 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
  
  	jfs_inode_cachep =
@@ -38237,9 +40949,9 @@ diff -urNp linux-3.0.3/fs/jfs/super.c linux-3.0.3/fs/jfs/super.c
  			    init_once);
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
-diff -urNp linux-3.0.3/fs/Kconfig.binfmt linux-3.0.3/fs/Kconfig.binfmt
---- linux-3.0.3/fs/Kconfig.binfmt	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/Kconfig.binfmt	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/Kconfig.binfmt linux-3.0.4/fs/Kconfig.binfmt
+--- linux-3.0.4/fs/Kconfig.binfmt	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/Kconfig.binfmt	2011-08-23 21:47:56.000000000 -0400
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -38249,9 +40961,9 @@ diff -urNp linux-3.0.3/fs/Kconfig.binfmt linux-3.0.3/fs/Kconfig.binfmt
  	---help---
  	  A.out (Assembler.OUTput) is a set of formats for libraries and
  	  executables used in the earliest versions of UNIX.  Linux used
-diff -urNp linux-3.0.3/fs/libfs.c linux-3.0.3/fs/libfs.c
---- linux-3.0.3/fs/libfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/libfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/libfs.c linux-3.0.4/fs/libfs.c
+--- linux-3.0.4/fs/libfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/libfs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
  
  			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
@@ -38276,9 +40988,9 @@ diff -urNp linux-3.0.3/fs/libfs.c linux-3.0.3/fs/libfs.c
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff -urNp linux-3.0.3/fs/lockd/clntproc.c linux-3.0.3/fs/lockd/clntproc.c
---- linux-3.0.3/fs/lockd/clntproc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/lockd/clntproc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
+--- linux-3.0.4/fs/lockd/clntproc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/lockd/clntproc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -38302,9 +41014,9 @@ diff -urNp linux-3.0.3/fs/lockd/clntproc.c linux-3.0.3/fs/lockd/clntproc.c
  	req = &reqst;
  	memset(req, 0, sizeof(*req));
  	locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-3.0.3/fs/locks.c linux-3.0.3/fs/locks.c
---- linux-3.0.3/fs/locks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/locks.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/locks.c linux-3.0.4/fs/locks.c
+--- linux-3.0.4/fs/locks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/locks.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
@@ -38326,9 +41038,9 @@ diff -urNp linux-3.0.3/fs/locks.c linux-3.0.3/fs/locks.c
  	}
  
  	lock_flocks();
-diff -urNp linux-3.0.3/fs/logfs/super.c linux-3.0.3/fs/logfs/super.c
---- linux-3.0.3/fs/logfs/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/logfs/super.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/logfs/super.c linux-3.0.4/fs/logfs/super.c
+--- linux-3.0.4/fs/logfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/logfs/super.c	2011-08-23 21:48:14.000000000 -0400
 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
  	struct logfs_disk_super _ds1, *ds1 = &_ds1;
  	int err, valid0, valid1;
@@ -38338,9 +41050,9 @@ diff -urNp linux-3.0.3/fs/logfs/super.c linux-3.0.3/fs/logfs/super.c
  	/* read first superblock */
  	err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
  	if (err)
-diff -urNp linux-3.0.3/fs/namei.c linux-3.0.3/fs/namei.c
---- linux-3.0.3/fs/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/namei.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
+--- linux-3.0.4/fs/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/namei.c	2011-08-23 21:48:14.000000000 -0400
 @@ -237,21 +237,31 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -38808,9 +41520,9 @@ diff -urNp linux-3.0.3/fs/namei.c linux-3.0.3/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-3.0.3/fs/namespace.c linux-3.0.3/fs/namespace.c
---- linux-3.0.3/fs/namespace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/namespace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
+--- linux-3.0.4/fs/namespace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/namespace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -38870,9 +41582,9 @@ diff -urNp linux-3.0.3/fs/namespace.c linux-3.0.3/fs/namespace.c
  	get_fs_root(current->fs, &root);
  	error = lock_mount(&old);
  	if (error)
-diff -urNp linux-3.0.3/fs/ncpfs/dir.c linux-3.0.3/fs/ncpfs/dir.c
---- linux-3.0.3/fs/ncpfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ncpfs/dir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ncpfs/dir.c linux-3.0.4/fs/ncpfs/dir.c
+--- linux-3.0.4/fs/ncpfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ncpfs/dir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
  	int res, val = 0, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
@@ -38918,9 +41630,9 @@ diff -urNp linux-3.0.3/fs/ncpfs/dir.c linux-3.0.3/fs/ncpfs/dir.c
  	DPRINTK("ncp_rename: %s/%s to %s/%s\n",
  		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
  		new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
-diff -urNp linux-3.0.3/fs/ncpfs/inode.c linux-3.0.3/fs/ncpfs/inode.c
---- linux-3.0.3/fs/ncpfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ncpfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ncpfs/inode.c linux-3.0.4/fs/ncpfs/inode.c
+--- linux-3.0.4/fs/ncpfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ncpfs/inode.c	2011-08-23 21:48:14.000000000 -0400
 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
  #endif
  	struct ncp_entry_info finfo;
@@ -38930,9 +41642,9 @@ diff -urNp linux-3.0.3/fs/ncpfs/inode.c linux-3.0.3/fs/ncpfs/inode.c
  	memset(&data, 0, sizeof(data));
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
-diff -urNp linux-3.0.3/fs/nfs/inode.c linux-3.0.3/fs/nfs/inode.c
---- linux-3.0.3/fs/nfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/nfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
+--- linux-3.0.4/fs/nfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/nfs/inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
  	nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
  	nfsi->attrtimeo_timestamp = jiffies;
@@ -38962,9 +41674,9 @@ diff -urNp linux-3.0.3/fs/nfs/inode.c linux-3.0.3/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-3.0.3/fs/nfsd/nfs4state.c linux-3.0.3/fs/nfsd/nfs4state.c
---- linux-3.0.3/fs/nfsd/nfs4state.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/nfsd/nfs4state.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfsd/nfs4state.c linux-3.0.4/fs/nfsd/nfs4state.c
+--- linux-3.0.4/fs/nfsd/nfs4state.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/nfsd/nfs4state.c	2011-08-23 21:48:14.000000000 -0400
 @@ -3794,6 +3794,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
  	unsigned int strhashval;
  	int err;
@@ -38974,9 +41686,9 @@ diff -urNp linux-3.0.3/fs/nfsd/nfs4state.c linux-3.0.3/fs/nfsd/nfs4state.c
  	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
  		(long long) lock->lk_offset,
  		(long long) lock->lk_length);
-diff -urNp linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3/fs/nfsd/nfs4xdr.c
---- linux-3.0.3/fs/nfsd/nfs4xdr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/nfsd/nfs4xdr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4/fs/nfsd/nfs4xdr.c
+--- linux-3.0.4/fs/nfsd/nfs4xdr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/nfsd/nfs4xdr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1788,6 +1788,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
  		.dentry	= dentry,
  	};
@@ -38986,9 +41698,9 @@ diff -urNp linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3/fs/nfsd/nfs4xdr.c
  	BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
  	BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
  	BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff -urNp linux-3.0.3/fs/nfsd/vfs.c linux-3.0.3/fs/nfsd/vfs.c
---- linux-3.0.3/fs/nfsd/vfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/nfsd/vfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
+--- linux-3.0.4/fs/nfsd/vfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/nfsd/vfs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -39016,9 +41728,9 @@ diff -urNp linux-3.0.3/fs/nfsd/vfs.c linux-3.0.3/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-3.0.3/fs/notify/fanotify/fanotify_user.c linux-3.0.3/fs/notify/fanotify/fanotify_user.c
---- linux-3.0.3/fs/notify/fanotify/fanotify_user.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/notify/fanotify/fanotify_user.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/notify/fanotify/fanotify_user.c linux-3.0.4/fs/notify/fanotify/fanotify_user.c
+--- linux-3.0.4/fs/notify/fanotify/fanotify_user.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/notify/fanotify/fanotify_user.c	2011-08-23 21:48:14.000000000 -0400
 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
  		goto out_close_fd;
  
@@ -39029,9 +41741,9 @@ diff -urNp linux-3.0.3/fs/notify/fanotify/fanotify_user.c linux-3.0.3/fs/notify/
  			 fanotify_event_metadata.event_len))
  		goto out_kill_access_response;
  
-diff -urNp linux-3.0.3/fs/notify/notification.c linux-3.0.3/fs/notify/notification.c
---- linux-3.0.3/fs/notify/notification.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/notify/notification.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/notify/notification.c linux-3.0.4/fs/notify/notification.c
+--- linux-3.0.4/fs/notify/notification.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/notify/notification.c	2011-08-23 21:47:56.000000000 -0400
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -39050,9 +41762,9 @@ diff -urNp linux-3.0.3/fs/notify/notification.c linux-3.0.3/fs/notify/notificati
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-3.0.3/fs/ntfs/dir.c linux-3.0.3/fs/ntfs/dir.c
---- linux-3.0.3/fs/ntfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ntfs/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ntfs/dir.c linux-3.0.4/fs/ntfs/dir.c
+--- linux-3.0.4/fs/ntfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ntfs/dir.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -39062,9 +41774,9 @@ diff -urNp linux-3.0.3/fs/ntfs/dir.c linux-3.0.3/fs/ntfs/dir.c
  		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
  				"inode 0x%lx or driver bug.", vdir->i_ino);
  		goto err_out;
-diff -urNp linux-3.0.3/fs/ntfs/file.c linux-3.0.3/fs/ntfs/file.c
---- linux-3.0.3/fs/ntfs/file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ntfs/file.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ntfs/file.c linux-3.0.4/fs/ntfs/file.c
+--- linux-3.0.4/fs/ntfs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ntfs/file.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -39074,9 +41786,9 @@ diff -urNp linux-3.0.3/fs/ntfs/file.c linux-3.0.3/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-3.0.3/fs/ocfs2/localalloc.c linux-3.0.3/fs/ocfs2/localalloc.c
---- linux-3.0.3/fs/ocfs2/localalloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/localalloc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/localalloc.c linux-3.0.4/fs/ocfs2/localalloc.c
+--- linux-3.0.4/fs/ocfs2/localalloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/localalloc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
@@ -39086,9 +41798,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/localalloc.c linux-3.0.3/fs/ocfs2/localalloc.c
  
  bail:
  	if (handle)
-diff -urNp linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3/fs/ocfs2/namei.c
---- linux-3.0.3/fs/ocfs2/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/namei.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4/fs/ocfs2/namei.c
+--- linux-3.0.4/fs/ocfs2/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/namei.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
  	struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
  	struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -39098,9 +41810,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3/fs/ocfs2/namei.c
  	/* At some point it might be nice to break this function up a
  	 * bit. */
  
-diff -urNp linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3/fs/ocfs2/ocfs2.h
---- linux-3.0.3/fs/ocfs2/ocfs2.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/ocfs2.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4/fs/ocfs2/ocfs2.h
+--- linux-3.0.4/fs/ocfs2/ocfs2.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/ocfs2.h	2011-08-23 21:47:56.000000000 -0400
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -39118,9 +41830,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-3.0.3/fs/ocfs2/suballoc.c linux-3.0.3/fs/ocfs2/suballoc.c
---- linux-3.0.3/fs/ocfs2/suballoc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/suballoc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/suballoc.c linux-3.0.4/fs/ocfs2/suballoc.c
+--- linux-3.0.4/fs/ocfs2/suballoc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/suballoc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
@@ -39175,9 +41887,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/suballoc.c linux-3.0.3/fs/ocfs2/suballoc.c
  			*num_clusters = res.sr_bits;
  		}
  	}
-diff -urNp linux-3.0.3/fs/ocfs2/super.c linux-3.0.3/fs/ocfs2/super.c
---- linux-3.0.3/fs/ocfs2/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/super.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/super.c linux-3.0.4/fs/ocfs2/super.c
+--- linux-3.0.4/fs/ocfs2/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/super.c	2011-08-23 21:47:56.000000000 -0400
 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -39212,9 +41924,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/super.c linux-3.0.3/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-3.0.3/fs/ocfs2/symlink.c linux-3.0.3/fs/ocfs2/symlink.c
---- linux-3.0.3/fs/ocfs2/symlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/symlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/symlink.c linux-3.0.4/fs/ocfs2/symlink.c
+--- linux-3.0.4/fs/ocfs2/symlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/symlink.c	2011-08-23 21:47:56.000000000 -0400
 @@ -142,7 +142,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -39224,9 +41936,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/symlink.c linux-3.0.3/fs/ocfs2/symlink.c
  	if (!IS_ERR(link))
  		kfree(link);
  }
-diff -urNp linux-3.0.3/fs/open.c linux-3.0.3/fs/open.c
---- linux-3.0.3/fs/open.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/open.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
+--- linux-3.0.4/fs/open.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/open.c	2011-08-23 21:48:14.000000000 -0400
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -39364,9 +42076,9 @@ diff -urNp linux-3.0.3/fs/open.c linux-3.0.3/fs/open.c
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-3.0.3/fs/partitions/ldm.c linux-3.0.3/fs/partitions/ldm.c
---- linux-3.0.3/fs/partitions/ldm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/partitions/ldm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/partitions/ldm.c linux-3.0.4/fs/partitions/ldm.c
+--- linux-3.0.4/fs/partitions/ldm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/partitions/ldm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
  		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
@@ -39384,9 +42096,9 @@ diff -urNp linux-3.0.3/fs/partitions/ldm.c linux-3.0.3/fs/partitions/ldm.c
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-diff -urNp linux-3.0.3/fs/pipe.c linux-3.0.3/fs/pipe.c
---- linux-3.0.3/fs/pipe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/pipe.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/pipe.c linux-3.0.4/fs/pipe.c
+--- linux-3.0.4/fs/pipe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/pipe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -39510,9 +42222,9 @@ diff -urNp linux-3.0.3/fs/pipe.c linux-3.0.3/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-3.0.3/fs/proc/array.c linux-3.0.3/fs/proc/array.c
---- linux-3.0.3/fs/proc/array.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/array.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
+--- linux-3.0.4/fs/proc/array.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/array.c	2011-08-23 21:48:14.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -39636,9 +42348,9 @@ diff -urNp linux-3.0.3/fs/proc/array.c linux-3.0.3/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-3.0.3/fs/proc/base.c linux-3.0.3/fs/proc/base.c
---- linux-3.0.3/fs/proc/base.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/proc/base.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
+--- linux-3.0.4/fs/proc/base.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/proc/base.c	2011-08-23 21:48:14.000000000 -0400
 @@ -107,6 +107,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -40070,9 +42782,9 @@ diff -urNp linux-3.0.3/fs/proc/base.c linux-3.0.3/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-3.0.3/fs/proc/cmdline.c linux-3.0.3/fs/proc/cmdline.c
---- linux-3.0.3/fs/proc/cmdline.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/cmdline.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/cmdline.c linux-3.0.4/fs/proc/cmdline.c
+--- linux-3.0.4/fs/proc/cmdline.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/cmdline.c	2011-08-23 21:48:14.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -40085,9 +42797,9 @@ diff -urNp linux-3.0.3/fs/proc/cmdline.c linux-3.0.3/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-3.0.3/fs/proc/devices.c linux-3.0.3/fs/proc/devices.c
---- linux-3.0.3/fs/proc/devices.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/devices.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/devices.c linux-3.0.4/fs/proc/devices.c
+--- linux-3.0.4/fs/proc/devices.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/devices.c	2011-08-23 21:48:14.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -40100,9 +42812,9 @@ diff -urNp linux-3.0.3/fs/proc/devices.c linux-3.0.3/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-3.0.3/fs/proc/inode.c linux-3.0.3/fs/proc/inode.c
---- linux-3.0.3/fs/proc/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/inode.c linux-3.0.4/fs/proc/inode.c
+--- linux-3.0.4/fs/proc/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/inode.c	2011-08-23 21:48:14.000000000 -0400
 @@ -440,7 +440,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
@@ -40115,9 +42827,9 @@ diff -urNp linux-3.0.3/fs/proc/inode.c linux-3.0.3/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-3.0.3/fs/proc/internal.h linux-3.0.3/fs/proc/internal.h
---- linux-3.0.3/fs/proc/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/internal.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/internal.h linux-3.0.4/fs/proc/internal.h
+--- linux-3.0.4/fs/proc/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/internal.h	2011-08-23 21:48:14.000000000 -0400
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -40128,9 +42840,9 @@ diff -urNp linux-3.0.3/fs/proc/internal.h linux-3.0.3/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-3.0.3/fs/proc/Kconfig linux-3.0.3/fs/proc/Kconfig
---- linux-3.0.3/fs/proc/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/Kconfig linux-3.0.4/fs/proc/Kconfig
+--- linux-3.0.4/fs/proc/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -40158,9 +42870,9 @@ diff -urNp linux-3.0.3/fs/proc/Kconfig linux-3.0.3/fs/proc/Kconfig
  	bool "Enable /proc page monitoring" if EXPERT
   	help
  	  Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-3.0.3/fs/proc/kcore.c linux-3.0.3/fs/proc/kcore.c
---- linux-3.0.3/fs/proc/kcore.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/kcore.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/kcore.c linux-3.0.4/fs/proc/kcore.c
+--- linux-3.0.4/fs/proc/kcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/kcore.c	2011-08-23 21:48:14.000000000 -0400
 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
  	off_t offset = 0;
  	struct kcore_list *m;
@@ -40228,9 +42940,9 @@ diff -urNp linux-3.0.3/fs/proc/kcore.c linux-3.0.3/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-3.0.3/fs/proc/meminfo.c linux-3.0.3/fs/proc/meminfo.c
---- linux-3.0.3/fs/proc/meminfo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/meminfo.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/meminfo.c linux-3.0.4/fs/proc/meminfo.c
+--- linux-3.0.4/fs/proc/meminfo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/meminfo.c	2011-08-23 21:48:14.000000000 -0400
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
  	unsigned long pages[NR_LRU_LISTS];
  	int lru;
@@ -40249,9 +42961,9 @@ diff -urNp linux-3.0.3/fs/proc/meminfo.c linux-3.0.3/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  		,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-3.0.3/fs/proc/nommu.c linux-3.0.3/fs/proc/nommu.c
---- linux-3.0.3/fs/proc/nommu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/nommu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/nommu.c linux-3.0.4/fs/proc/nommu.c
+--- linux-3.0.4/fs/proc/nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/nommu.c	2011-08-23 21:47:56.000000000 -0400
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
@@ -40261,9 +42973,9 @@ diff -urNp linux-3.0.3/fs/proc/nommu.c linux-3.0.3/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-3.0.3/fs/proc/proc_net.c linux-3.0.3/fs/proc/proc_net.c
---- linux-3.0.3/fs/proc/proc_net.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/proc_net.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/proc_net.c linux-3.0.4/fs/proc/proc_net.c
+--- linux-3.0.4/fs/proc/proc_net.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/proc_net.c	2011-08-23 21:48:14.000000000 -0400
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
@@ -40282,9 +42994,9 @@ diff -urNp linux-3.0.3/fs/proc/proc_net.c linux-3.0.3/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-3.0.3/fs/proc/proc_sysctl.c linux-3.0.3/fs/proc/proc_sysctl.c
---- linux-3.0.3/fs/proc/proc_sysctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/proc_sysctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
+--- linux-3.0.4/fs/proc/proc_sysctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/proc_sysctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -8,6 +8,8 @@
  #include <linux/namei.h>
  #include "internal.h"
@@ -40324,9 +43036,9 @@ diff -urNp linux-3.0.3/fs/proc/proc_sysctl.c linux-3.0.3/fs/proc/proc_sysctl.c
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-3.0.3/fs/proc/root.c linux-3.0.3/fs/proc/root.c
---- linux-3.0.3/fs/proc/root.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/root.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/root.c linux-3.0.4/fs/proc/root.c
+--- linux-3.0.4/fs/proc/root.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/root.c	2011-08-23 21:48:14.000000000 -0400
 @@ -123,7 +123,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
@@ -40343,9 +43055,9 @@ diff -urNp linux-3.0.3/fs/proc/root.c linux-3.0.3/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-3.0.3/fs/proc/task_mmu.c linux-3.0.3/fs/proc/task_mmu.c
---- linux-3.0.3/fs/proc/task_mmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/task_mmu.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
+--- linux-3.0.4/fs/proc/task_mmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/task_mmu.c	2011-08-23 21:48:14.000000000 -0400
 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
@@ -40485,9 +43197,9 @@ diff -urNp linux-3.0.3/fs/proc/task_mmu.c linux-3.0.3/fs/proc/task_mmu.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-3.0.3/fs/proc/task_nommu.c linux-3.0.3/fs/proc/task_nommu.c
---- linux-3.0.3/fs/proc/task_nommu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/task_nommu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/task_nommu.c linux-3.0.4/fs/proc/task_nommu.c
+--- linux-3.0.4/fs/proc/task_nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/task_nommu.c	2011-08-23 21:47:56.000000000 -0400
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
@@ -40506,9 +43218,9 @@ diff -urNp linux-3.0.3/fs/proc/task_nommu.c linux-3.0.3/fs/proc/task_nommu.c
  	} else if (mm) {
  		if (vma->vm_start <= mm->start_stack &&
  			vma->vm_end >= mm->start_stack) {
-diff -urNp linux-3.0.3/fs/quota/netlink.c linux-3.0.3/fs/quota/netlink.c
---- linux-3.0.3/fs/quota/netlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/quota/netlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/quota/netlink.c linux-3.0.4/fs/quota/netlink.c
+--- linux-3.0.4/fs/quota/netlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/quota/netlink.c	2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
  void quota_send_warning(short type, unsigned int id, dev_t dev,
  			const char warntype)
@@ -40527,9 +43239,9 @@ diff -urNp linux-3.0.3/fs/quota/netlink.c linux-3.0.3/fs/quota/netlink.c
  			&quota_genl_family, 0, QUOTA_NL_C_WARNING);
  	if (!msg_head) {
  		printk(KERN_ERR
-diff -urNp linux-3.0.3/fs/readdir.c linux-3.0.3/fs/readdir.c
---- linux-3.0.3/fs/readdir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/readdir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/readdir.c linux-3.0.4/fs/readdir.c
+--- linux-3.0.4/fs/readdir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/readdir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -40619,9 +43331,9 @@ diff -urNp linux-3.0.3/fs/readdir.c linux-3.0.3/fs/readdir.c
  	buf.count = count;
  	buf.error = 0;
  
-diff -urNp linux-3.0.3/fs/reiserfs/dir.c linux-3.0.3/fs/reiserfs/dir.c
---- linux-3.0.3/fs/reiserfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/dir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/dir.c linux-3.0.4/fs/reiserfs/dir.c
+--- linux-3.0.4/fs/reiserfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/dir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
  	struct reiserfs_dir_entry de;
  	int ret = 0;
@@ -40631,9 +43343,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/dir.c linux-3.0.3/fs/reiserfs/dir.c
  	reiserfs_write_lock(inode->i_sb);
  
  	reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-3.0.3/fs/reiserfs/do_balan.c linux-3.0.3/fs/reiserfs/do_balan.c
---- linux-3.0.3/fs/reiserfs/do_balan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/do_balan.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/do_balan.c linux-3.0.4/fs/reiserfs/do_balan.c
+--- linux-3.0.4/fs/reiserfs/do_balan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/do_balan.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
@@ -40643,9 +43355,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/do_balan.c linux-3.0.3/fs/reiserfs/do_balan.c
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-3.0.3/fs/reiserfs/journal.c linux-3.0.3/fs/reiserfs/journal.c
---- linux-3.0.3/fs/reiserfs/journal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/journal.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/journal.c linux-3.0.4/fs/reiserfs/journal.c
+--- linux-3.0.4/fs/reiserfs/journal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/journal.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
  	struct buffer_head *bh;
  	int i, j;
@@ -40655,9 +43367,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/journal.c linux-3.0.3/fs/reiserfs/journal.c
  	bh = __getblk(dev, block, bufsize);
  	if (buffer_uptodate(bh))
  		return (bh);
-diff -urNp linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3/fs/reiserfs/namei.c
---- linux-3.0.3/fs/reiserfs/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/namei.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4/fs/reiserfs/namei.c
+--- linux-3.0.4/fs/reiserfs/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/namei.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode 
  	unsigned long savelink = 1;
  	struct timespec ctime;
@@ -40667,9 +43379,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3/fs/reiserfs/namei.c
  	/* three balancings: (1) old name removal, (2) new name insertion
  	   and (3) maybe "save" link insertion
  	   stat data updates: (1) old directory,
-diff -urNp linux-3.0.3/fs/reiserfs/procfs.c linux-3.0.3/fs/reiserfs/procfs.c
---- linux-3.0.3/fs/reiserfs/procfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/procfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/procfs.c linux-3.0.4/fs/reiserfs/procfs.c
+--- linux-3.0.4/fs/reiserfs/procfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/procfs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -40688,9 +43400,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/procfs.c linux-3.0.3/fs/reiserfs/procfs.c
  	seq_printf(m,		/* on-disk fields */
  		   "jp_journal_1st_block: \t%i\n"
  		   "jp_journal_dev: \t%s[%x]\n"
-diff -urNp linux-3.0.3/fs/reiserfs/stree.c linux-3.0.3/fs/reiserfs/stree.c
---- linux-3.0.3/fs/reiserfs/stree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/stree.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/stree.c linux-3.0.4/fs/reiserfs/stree.c
+--- linux-3.0.4/fs/reiserfs/stree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/stree.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
  	int iter = 0;
  #endif
@@ -40736,9 +43448,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/stree.c linux-3.0.3/fs/reiserfs/stree.c
  	BUG_ON(!th->t_trans_id);
  
  	if (inode) {		/* Do we count quotas for item? */
-diff -urNp linux-3.0.3/fs/reiserfs/super.c linux-3.0.3/fs/reiserfs/super.c
---- linux-3.0.3/fs/reiserfs/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/super.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/super.c linux-3.0.4/fs/reiserfs/super.c
+--- linux-3.0.4/fs/reiserfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/super.c	2011-08-23 21:48:14.000000000 -0400
 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
  		{.option_name = NULL}
  	};
@@ -40748,9 +43460,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/super.c linux-3.0.3/fs/reiserfs/super.c
  	*blocks = 0;
  	if (!options || !*options)
  		/* use default configuration: create tails, journaling on, no
-diff -urNp linux-3.0.3/fs/select.c linux-3.0.3/fs/select.c
---- linux-3.0.3/fs/select.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/select.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/select.c linux-3.0.4/fs/select.c
+--- linux-3.0.4/fs/select.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/select.c	2011-08-23 21:48:14.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -40787,9 +43499,9 @@ diff -urNp linux-3.0.3/fs/select.c linux-3.0.3/fs/select.c
  	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff -urNp linux-3.0.3/fs/seq_file.c linux-3.0.3/fs/seq_file.c
---- linux-3.0.3/fs/seq_file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/seq_file.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/seq_file.c linux-3.0.4/fs/seq_file.c
+--- linux-3.0.4/fs/seq_file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/seq_file.c	2011-08-23 21:47:56.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
@@ -40839,9 +43551,9 @@ diff -urNp linux-3.0.3/fs/seq_file.c linux-3.0.3/fs/seq_file.c
  	int res = -ENOMEM;
  
  	if (op) {
-diff -urNp linux-3.0.3/fs/splice.c linux-3.0.3/fs/splice.c
---- linux-3.0.3/fs/splice.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/splice.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
+--- linux-3.0.4/fs/splice.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/splice.c	2011-08-23 21:48:14.000000000 -0400
 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -41007,9 +43719,9 @@ diff -urNp linux-3.0.3/fs/splice.c linux-3.0.3/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-3.0.3/fs/sysfs/file.c linux-3.0.3/fs/sysfs/file.c
---- linux-3.0.3/fs/sysfs/file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/sysfs/file.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/sysfs/file.c linux-3.0.4/fs/sysfs/file.c
+--- linux-3.0.4/fs/sysfs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/sysfs/file.c	2011-08-23 21:47:56.000000000 -0400
 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -41055,9 +43767,9 @@ diff -urNp linux-3.0.3/fs/sysfs/file.c linux-3.0.3/fs/sysfs/file.c
  		wake_up_interruptible(&od->poll);
  	}
  
-diff -urNp linux-3.0.3/fs/sysfs/mount.c linux-3.0.3/fs/sysfs/mount.c
---- linux-3.0.3/fs/sysfs/mount.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/sysfs/mount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/sysfs/mount.c linux-3.0.4/fs/sysfs/mount.c
+--- linux-3.0.4/fs/sysfs/mount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/sysfs/mount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -41070,9 +43782,9 @@ diff -urNp linux-3.0.3/fs/sysfs/mount.c linux-3.0.3/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-3.0.3/fs/sysfs/symlink.c linux-3.0.3/fs/sysfs/symlink.c
---- linux-3.0.3/fs/sysfs/symlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/sysfs/symlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/sysfs/symlink.c linux-3.0.4/fs/sysfs/symlink.c
+--- linux-3.0.4/fs/sysfs/symlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/sysfs/symlink.c	2011-08-23 21:47:56.000000000 -0400
 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -41082,9 +43794,9 @@ diff -urNp linux-3.0.3/fs/sysfs/symlink.c linux-3.0.3/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-3.0.3/fs/udf/inode.c linux-3.0.3/fs/udf/inode.c
---- linux-3.0.3/fs/udf/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/udf/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/udf/inode.c linux-3.0.4/fs/udf/inode.c
+--- linux-3.0.4/fs/udf/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/udf/inode.c	2011-08-23 21:48:14.000000000 -0400
 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
  	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
  	int lastblock = 0;
@@ -41094,9 +43806,9 @@ diff -urNp linux-3.0.3/fs/udf/inode.c linux-3.0.3/fs/udf/inode.c
  	prev_epos.offset = udf_file_entry_alloc_offset(inode);
  	prev_epos.block = iinfo->i_location;
  	prev_epos.bh = NULL;
-diff -urNp linux-3.0.3/fs/udf/misc.c linux-3.0.3/fs/udf/misc.c
---- linux-3.0.3/fs/udf/misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/udf/misc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/udf/misc.c linux-3.0.4/fs/udf/misc.c
+--- linux-3.0.4/fs/udf/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/udf/misc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -41106,9 +43818,9 @@ diff -urNp linux-3.0.3/fs/udf/misc.c linux-3.0.3/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-3.0.3/fs/utimes.c linux-3.0.3/fs/utimes.c
---- linux-3.0.3/fs/utimes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/utimes.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/utimes.c linux-3.0.4/fs/utimes.c
+--- linux-3.0.4/fs/utimes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/utimes.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -41130,9 +43842,9 @@ diff -urNp linux-3.0.3/fs/utimes.c linux-3.0.3/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-3.0.3/fs/xattr_acl.c linux-3.0.3/fs/xattr_acl.c
---- linux-3.0.3/fs/xattr_acl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xattr_acl.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xattr_acl.c linux-3.0.4/fs/xattr_acl.c
+--- linux-3.0.4/fs/xattr_acl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xattr_acl.c	2011-08-23 21:47:56.000000000 -0400
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -41144,9 +43856,9 @@ diff -urNp linux-3.0.3/fs/xattr_acl.c linux-3.0.3/fs/xattr_acl.c
  	int count;
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
-diff -urNp linux-3.0.3/fs/xattr.c linux-3.0.3/fs/xattr.c
---- linux-3.0.3/fs/xattr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xattr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/xattr.c linux-3.0.4/fs/xattr.c
+--- linux-3.0.4/fs/xattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xattr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -41209,9 +43921,9 @@ diff -urNp linux-3.0.3/fs/xattr.c linux-3.0.3/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-08-23 21:48:14.000000000 -0400
 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
  	xfs_fsop_geom_t		  fsgeo;
  	int			  error;
@@ -41220,9 +43932,9 @@ diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.3/fs/xfs/linux-2
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
  	if (error)
  		return -error;
-diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-08-23 21:47:56.000000000 -0400
 @@ -128,7 +128,7 @@ xfs_find_handle(
  	}
  
@@ -41232,9 +43944,9 @@ diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3/fs/xfs/linux-2.6
  	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
  		goto out_put;
  
-diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c	2011-08-23 21:47:56.000000000 -0400
 @@ -437,7 +437,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
@@ -41244,9 +43956,9 @@ diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3/fs/xfs/linux-2.6/
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-3.0.3/fs/xfs/xfs_bmap.c linux-3.0.3/fs/xfs/xfs_bmap.c
---- linux-3.0.3/fs/xfs/xfs_bmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/xfs_bmap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/xfs_bmap.c linux-3.0.4/fs/xfs/xfs_bmap.c
+--- linux-3.0.4/fs/xfs/xfs_bmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/xfs_bmap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
@@ -41256,9 +43968,9 @@ diff -urNp linux-3.0.3/fs/xfs/xfs_bmap.c linux-3.0.3/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-3.0.3/fs/xfs/xfs_dir2_sf.c linux-3.0.3/fs/xfs/xfs_dir2_sf.c
---- linux-3.0.3/fs/xfs/xfs_dir2_sf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/xfs_dir2_sf.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/xfs_dir2_sf.c linux-3.0.4/fs/xfs/xfs_dir2_sf.c
+--- linux-3.0.4/fs/xfs/xfs_dir2_sf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/xfs_dir2_sf.c	2011-08-23 21:47:56.000000000 -0400
 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -41276,9 +43988,9 @@ diff -urNp linux-3.0.3/fs/xfs/xfs_dir2_sf.c linux-3.0.3/fs/xfs/xfs_dir2_sf.c
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-3.0.3/grsecurity/gracl_alloc.c linux-3.0.3/grsecurity/gracl_alloc.c
---- linux-3.0.3/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_alloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_alloc.c linux-3.0.4/grsecurity/gracl_alloc.c
+--- linux-3.0.4/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_alloc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -41385,9 +44097,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_alloc.c linux-3.0.3/grsecurity/gracl_all
 +	else
 +		return 1;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl.c linux-3.0.3/grsecurity/gracl.c
---- linux-3.0.3/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
+--- linux-3.0.4/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,4106 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -45495,9 +48207,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl.c linux-3.0.3/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-3.0.3/grsecurity/gracl_cap.c linux-3.0.3/grsecurity/gracl_cap.c
---- linux-3.0.3/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_cap.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_cap.c linux-3.0.4/grsecurity/gracl_cap.c
+--- linux-3.0.4/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_cap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,139 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -45638,9 +48350,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_cap.c linux-3.0.3/grsecurity/gracl_cap.c
 +	return 0;
 +}
 +
-diff -urNp linux-3.0.3/grsecurity/gracl_fs.c linux-3.0.3/grsecurity/gracl_fs.c
---- linux-3.0.3/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_fs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
+--- linux-3.0.4/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_fs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -46073,9 +48785,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_fs.c linux-3.0.3/grsecurity/gracl_fs.c
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_ip.c linux-3.0.3/grsecurity/gracl_ip.c
---- linux-3.0.3/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_ip.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_ip.c linux-3.0.4/grsecurity/gracl_ip.c
+--- linux-3.0.4/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_ip.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -46458,9 +49170,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_ip.c linux-3.0.3/grsecurity/gracl_ip.c
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_learn.c linux-3.0.3/grsecurity/gracl_learn.c
---- linux-3.0.3/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_learn.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_learn.c linux-3.0.4/grsecurity/gracl_learn.c
+--- linux-3.0.4/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_learn.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46669,9 +49381,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_learn.c linux-3.0.3/grsecurity/gracl_lea
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-3.0.3/grsecurity/gracl_res.c linux-3.0.3/grsecurity/gracl_res.c
---- linux-3.0.3/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_res.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_res.c linux-3.0.4/grsecurity/gracl_res.c
+--- linux-3.0.4/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_res.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -46741,9 +49453,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_res.c linux-3.0.3/grsecurity/gracl_res.c
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_segv.c linux-3.0.3/grsecurity/gracl_segv.c
---- linux-3.0.3/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_segv.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv.c
+--- linux-3.0.4/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_segv.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -47044,9 +49756,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_segv.c linux-3.0.3/grsecurity/gracl_segv
 +
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_shm.c linux-3.0.3/grsecurity/gracl_shm.c
---- linux-3.0.3/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_shm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_shm.c linux-3.0.4/grsecurity/gracl_shm.c
+--- linux-3.0.4/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_shm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -47088,9 +49800,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_shm.c linux-3.0.3/grsecurity/gracl_shm.c
 +
 +	return 1;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_chdir.c linux-3.0.3/grsecurity/grsec_chdir.c
---- linux-3.0.3/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_chdir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_chdir.c linux-3.0.4/grsecurity/grsec_chdir.c
+--- linux-3.0.4/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_chdir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47111,9 +49823,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_chdir.c linux-3.0.3/grsecurity/grsec_chd
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_chroot.c linux-3.0.3/grsecurity/grsec_chroot.c
---- linux-3.0.3/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_chroot.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_chroot.c
+--- linux-3.0.4/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_chroot.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,349 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -47464,9 +50176,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_chroot.c linux-3.0.3/grsecurity/grsec_ch
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-3.0.3/grsecurity/grsec_disabled.c linux-3.0.3/grsecurity/grsec_disabled.c
---- linux-3.0.3/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_disabled.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_disabled.c
+--- linux-3.0.4/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_disabled.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -47915,9 +50627,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_disabled.c linux-3.0.3/grsecurity/grsec_
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-3.0.3/grsecurity/grsec_exec.c linux-3.0.3/grsecurity/grsec_exec.c
---- linux-3.0.3/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_exec.c	2011-08-25 17:25:59.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec.c
+--- linux-3.0.4/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_exec.c	2011-08-25 17:25:59.000000000 -0400
 @@ -0,0 +1,72 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47991,9 +50703,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_exec.c linux-3.0.3/grsecurity/grsec_exec
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_fifo.c linux-3.0.3/grsecurity/grsec_fifo.c
---- linux-3.0.3/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_fifo.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_fifo.c linux-3.0.4/grsecurity/grsec_fifo.c
+--- linux-3.0.4/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_fifo.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48019,9 +50731,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_fifo.c linux-3.0.3/grsecurity/grsec_fifo
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_fork.c linux-3.0.3/grsecurity/grsec_fork.c
---- linux-3.0.3/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_fork.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_fork.c linux-3.0.4/grsecurity/grsec_fork.c
+--- linux-3.0.4/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_fork.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48046,9 +50758,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_fork.c linux-3.0.3/grsecurity/grsec_fork
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init.c
---- linux-3.0.3/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_init.c	2011-08-25 17:25:12.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_init.c linux-3.0.4/grsecurity/grsec_init.c
+--- linux-3.0.4/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_init.c	2011-08-25 17:25:12.000000000 -0400
 @@ -0,0 +1,269 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48319,9 +51031,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init
 +
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_link.c linux-3.0.3/grsecurity/grsec_link.c
---- linux-3.0.3/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_link.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link.c
+--- linux-3.0.4/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_link.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48366,9 +51078,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_link.c linux-3.0.3/grsecurity/grsec_link
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_log.c linux-3.0.3/grsecurity/grsec_log.c
---- linux-3.0.3/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_log.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
+--- linux-3.0.4/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_log.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48680,9 +51392,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_log.c linux-3.0.3/grsecurity/grsec_log.c
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_mem.c linux-3.0.3/grsecurity/grsec_mem.c
---- linux-3.0.3/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_mem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_mem.c linux-3.0.4/grsecurity/grsec_mem.c
+--- linux-3.0.4/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48717,9 +51429,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_mem.c linux-3.0.3/grsecurity/grsec_mem.c
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_mount.c linux-3.0.3/grsecurity/grsec_mount.c
---- linux-3.0.3/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_mount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_mount.c linux-3.0.4/grsecurity/grsec_mount.c
+--- linux-3.0.4/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_mount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48783,9 +51495,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_mount.c linux-3.0.3/grsecurity/grsec_mou
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_pax.c linux-3.0.3/grsecurity/grsec_pax.c
---- linux-3.0.3/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_pax.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_pax.c linux-3.0.4/grsecurity/grsec_pax.c
+--- linux-3.0.4/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_pax.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48823,9 +51535,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_pax.c linux-3.0.3/grsecurity/grsec_pax.c
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_ptrace.c linux-3.0.3/grsecurity/grsec_ptrace.c
---- linux-3.0.3/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_ptrace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_ptrace.c linux-3.0.4/grsecurity/grsec_ptrace.c
+--- linux-3.0.4/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_ptrace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48841,9 +51553,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_ptrace.c linux-3.0.3/grsecurity/grsec_pt
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_sig.c linux-3.0.3/grsecurity/grsec_sig.c
---- linux-3.0.3/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_sig.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_sig.c linux-3.0.4/grsecurity/grsec_sig.c
+--- linux-3.0.4/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_sig.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49051,9 +51763,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sig.c linux-3.0.3/grsecurity/grsec_sig.c
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_sock.c linux-3.0.3/grsecurity/grsec_sock.c
---- linux-3.0.3/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_sock.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_sock.c linux-3.0.4/grsecurity/grsec_sock.c
+--- linux-3.0.4/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_sock.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -49299,9 +52011,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sock.c linux-3.0.3/grsecurity/grsec_sock
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_sysctl.c linux-3.0.3/grsecurity/grsec_sysctl.c
---- linux-3.0.3/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_sysctl.c	2011-08-25 17:26:15.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_sysctl.c linux-3.0.4/grsecurity/grsec_sysctl.c
+--- linux-3.0.4/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_sysctl.c	2011-08-25 17:26:15.000000000 -0400
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49736,9 +52448,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sysctl.c linux-3.0.3/grsecurity/grsec_sy
 +	{ }
 +};
 +#endif
-diff -urNp linux-3.0.3/grsecurity/grsec_time.c linux-3.0.3/grsecurity/grsec_time.c
---- linux-3.0.3/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_time.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_time.c linux-3.0.4/grsecurity/grsec_time.c
+--- linux-3.0.4/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_time.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49756,9 +52468,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_time.c linux-3.0.3/grsecurity/grsec_time
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-3.0.3/grsecurity/grsec_tpe.c linux-3.0.3/grsecurity/grsec_tpe.c
---- linux-3.0.3/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_tpe.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_tpe.c linux-3.0.4/grsecurity/grsec_tpe.c
+--- linux-3.0.4/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_tpe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49799,9 +52511,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_tpe.c linux-3.0.3/grsecurity/grsec_tpe.c
 +#endif
 +	return 1;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsum.c linux-3.0.3/grsecurity/grsum.c
---- linux-3.0.3/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsum.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsum.c linux-3.0.4/grsecurity/grsum.c
+--- linux-3.0.4/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsum.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -49864,9 +52576,9 @@ diff -urNp linux-3.0.3/grsecurity/grsum.c linux-3.0.3/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
---- linux-3.0.3/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/Kconfig	2011-08-25 17:25:34.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
+--- linux-3.0.4/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/Kconfig	2011-08-25 17:25:34.000000000 -0400
 @@ -0,0 +1,1038 @@
 +#
 +# grecurity configuration
@@ -50906,9 +53618,9 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-3.0.3/grsecurity/Makefile linux-3.0.3/grsecurity/Makefile
---- linux-3.0.3/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/Makefile	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/Makefile linux-3.0.4/grsecurity/Makefile
+--- linux-3.0.4/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/Makefile	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,34 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -50944,9 +53656,9 @@ diff -urNp linux-3.0.3/grsecurity/Makefile linux-3.0.3/grsecurity/Makefile
 +	@-chmod -f 700 .
 +	@echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-3.0.3/include/acpi/acpi_bus.h linux-3.0.3/include/acpi/acpi_bus.h
---- linux-3.0.3/include/acpi/acpi_bus.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/acpi/acpi_bus.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/acpi/acpi_bus.h linux-3.0.4/include/acpi/acpi_bus.h
+--- linux-3.0.4/include/acpi/acpi_bus.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/acpi/acpi_bus.h	2011-08-23 21:47:56.000000000 -0400
 @@ -107,7 +107,7 @@ struct acpi_device_ops {
  	acpi_op_bind bind;
  	acpi_op_unbind unbind;
@@ -50956,9 +53668,9 @@ diff -urNp linux-3.0.3/include/acpi/acpi_bus.h linux-3.0.3/include/acpi/acpi_bus
  
  #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
  
-diff -urNp linux-3.0.3/include/asm-generic/atomic-long.h linux-3.0.3/include/asm-generic/atomic-long.h
---- linux-3.0.3/include/asm-generic/atomic-long.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/atomic-long.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/atomic-long.h linux-3.0.4/include/asm-generic/atomic-long.h
+--- linux-3.0.4/include/asm-generic/atomic-long.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/atomic-long.h	2011-08-23 21:47:56.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -51259,9 +53971,9 @@ diff -urNp linux-3.0.3/include/asm-generic/atomic-long.h linux-3.0.3/include/asm
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-3.0.3/include/asm-generic/cache.h linux-3.0.3/include/asm-generic/cache.h
---- linux-3.0.3/include/asm-generic/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/cache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/cache.h linux-3.0.4/include/asm-generic/cache.h
+--- linux-3.0.4/include/asm-generic/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/cache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -51272,9 +53984,9 @@ diff -urNp linux-3.0.3/include/asm-generic/cache.h linux-3.0.3/include/asm-gener
 +#define L1_CACHE_BYTES		(1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-3.0.3/include/asm-generic/int-l64.h linux-3.0.3/include/asm-generic/int-l64.h
---- linux-3.0.3/include/asm-generic/int-l64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/int-l64.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/int-l64.h linux-3.0.4/include/asm-generic/int-l64.h
+--- linux-3.0.4/include/asm-generic/int-l64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/int-l64.h	2011-08-23 21:47:56.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -51284,9 +53996,9 @@ diff -urNp linux-3.0.3/include/asm-generic/int-l64.h linux-3.0.3/include/asm-gen
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.3/include/asm-generic/int-ll64.h linux-3.0.3/include/asm-generic/int-ll64.h
---- linux-3.0.3/include/asm-generic/int-ll64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/int-ll64.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/int-ll64.h linux-3.0.4/include/asm-generic/int-ll64.h
+--- linux-3.0.4/include/asm-generic/int-ll64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/int-ll64.h	2011-08-23 21:47:56.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -51296,9 +54008,9 @@ diff -urNp linux-3.0.3/include/asm-generic/int-ll64.h linux-3.0.3/include/asm-ge
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.3/include/asm-generic/kmap_types.h linux-3.0.3/include/asm-generic/kmap_types.h
---- linux-3.0.3/include/asm-generic/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/kmap_types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/kmap_types.h linux-3.0.4/include/asm-generic/kmap_types.h
+--- linux-3.0.4/include/asm-generic/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/kmap_types.h	2011-08-23 21:47:56.000000000 -0400
 @@ -29,10 +29,11 @@ KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
  KMAP_D(18)	KM_NMI_PTE,
@@ -51312,9 +54024,9 @@ diff -urNp linux-3.0.3/include/asm-generic/kmap_types.h linux-3.0.3/include/asm-
  };
  
  #undef KMAP_D
-diff -urNp linux-3.0.3/include/asm-generic/pgtable.h linux-3.0.3/include/asm-generic/pgtable.h
---- linux-3.0.3/include/asm-generic/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/pgtable.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/pgtable.h linux-3.0.4/include/asm-generic/pgtable.h
+--- linux-3.0.4/include/asm-generic/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/pgtable.h	2011-08-23 21:47:56.000000000 -0400
 @@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
  #endif /* __HAVE_ARCH_PMD_WRITE */
  #endif
@@ -51330,9 +54042,9 @@ diff -urNp linux-3.0.3/include/asm-generic/pgtable.h linux-3.0.3/include/asm-gen
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopmd.h linux-3.0.3/include/asm-generic/pgtable-nopmd.h
---- linux-3.0.3/include/asm-generic/pgtable-nopmd.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/pgtable-nopmd.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopmd.h linux-3.0.4/include/asm-generic/pgtable-nopmd.h
+--- linux-3.0.4/include/asm-generic/pgtable-nopmd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/pgtable-nopmd.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -51369,9 +54081,9 @@ diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopmd.h linux-3.0.3/include/a
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopud.h linux-3.0.3/include/asm-generic/pgtable-nopud.h
---- linux-3.0.3/include/asm-generic/pgtable-nopud.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/pgtable-nopud.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopud.h linux-3.0.4/include/asm-generic/pgtable-nopud.h
+--- linux-3.0.4/include/asm-generic/pgtable-nopud.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/pgtable-nopud.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -51402,9 +54114,9 @@ diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopud.h linux-3.0.3/include/a
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-3.0.3/include/asm-generic/vmlinux.lds.h linux-3.0.3/include/asm-generic/vmlinux.lds.h
---- linux-3.0.3/include/asm-generic/vmlinux.lds.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/vmlinux.lds.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/vmlinux.lds.h linux-3.0.4/include/asm-generic/vmlinux.lds.h
+--- linux-3.0.4/include/asm-generic/vmlinux.lds.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/vmlinux.lds.h	2011-08-23 21:47:56.000000000 -0400
 @@ -217,6 +217,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
@@ -51436,9 +54148,9 @@ diff -urNp linux-3.0.3/include/asm-generic/vmlinux.lds.h linux-3.0.3/include/asm
  
  /**
   * PERCPU_SECTION - define output section for percpu area, simple version
-diff -urNp linux-3.0.3/include/drm/drm_crtc_helper.h linux-3.0.3/include/drm/drm_crtc_helper.h
---- linux-3.0.3/include/drm/drm_crtc_helper.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/drm/drm_crtc_helper.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/drm/drm_crtc_helper.h linux-3.0.4/include/drm/drm_crtc_helper.h
+--- linux-3.0.4/include/drm/drm_crtc_helper.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/drm/drm_crtc_helper.h	2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
  
  	/* disable crtc when not in use - more explicit than dpms off */
@@ -51457,9 +54169,9 @@ diff -urNp linux-3.0.3/include/drm/drm_crtc_helper.h linux-3.0.3/include/drm/drm
  
  struct drm_connector_helper_funcs {
  	int (*get_modes)(struct drm_connector *connector);
-diff -urNp linux-3.0.3/include/drm/drmP.h linux-3.0.3/include/drm/drmP.h
---- linux-3.0.3/include/drm/drmP.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/drm/drmP.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
+--- linux-3.0.4/include/drm/drmP.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/drm/drmP.h	2011-08-23 21:47:56.000000000 -0400
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -51486,9 +54198,9 @@ diff -urNp linux-3.0.3/include/drm/drmP.h linux-3.0.3/include/drm/drmP.h
  	/*@} */
  
  	struct list_head filelist;
-diff -urNp linux-3.0.3/include/drm/ttm/ttm_memory.h linux-3.0.3/include/drm/ttm/ttm_memory.h
---- linux-3.0.3/include/drm/ttm/ttm_memory.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/drm/ttm/ttm_memory.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/drm/ttm/ttm_memory.h linux-3.0.4/include/drm/ttm/ttm_memory.h
+--- linux-3.0.4/include/drm/ttm/ttm_memory.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/drm/ttm/ttm_memory.h	2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@
  
  struct ttm_mem_shrink {
@@ -51498,9 +54210,9 @@ diff -urNp linux-3.0.3/include/drm/ttm/ttm_memory.h linux-3.0.3/include/drm/ttm/
  
  /**
   * struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-3.0.3/include/linux/a.out.h linux-3.0.3/include/linux/a.out.h
---- linux-3.0.3/include/linux/a.out.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/a.out.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/a.out.h linux-3.0.4/include/linux/a.out.h
+--- linux-3.0.4/include/linux/a.out.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/a.out.h	2011-08-23 21:47:56.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -51516,9 +54228,9 @@ diff -urNp linux-3.0.3/include/linux/a.out.h linux-3.0.3/include/linux/a.out.h
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-3.0.3/include/linux/atmdev.h linux-3.0.3/include/linux/atmdev.h
---- linux-3.0.3/include/linux/atmdev.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/atmdev.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/atmdev.h linux-3.0.4/include/linux/atmdev.h
+--- linux-3.0.4/include/linux/atmdev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/atmdev.h	2011-08-23 21:47:56.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -51528,9 +54240,9 @@ diff -urNp linux-3.0.3/include/linux/atmdev.h linux-3.0.3/include/linux/atmdev.h
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.3/include/linux/binfmts.h linux-3.0.3/include/linux/binfmts.h
---- linux-3.0.3/include/linux/binfmts.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/binfmts.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/binfmts.h linux-3.0.4/include/linux/binfmts.h
+--- linux-3.0.4/include/linux/binfmts.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/binfmts.h	2011-08-23 21:47:56.000000000 -0400
 @@ -88,6 +88,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
@@ -51539,9 +54251,9 @@ diff -urNp linux-3.0.3/include/linux/binfmts.h linux-3.0.3/include/linux/binfmts
  	unsigned long min_coredump;	/* minimal dump size */
  };
  
-diff -urNp linux-3.0.3/include/linux/blkdev.h linux-3.0.3/include/linux/blkdev.h
---- linux-3.0.3/include/linux/blkdev.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/blkdev.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/blkdev.h linux-3.0.4/include/linux/blkdev.h
+--- linux-3.0.4/include/linux/blkdev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/blkdev.h	2011-08-26 19:49:56.000000000 -0400
 @@ -1308,7 +1308,7 @@ struct block_device_operations {
  	/* this callback is with swap_lock and sometimes page table lock held */
  	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
@@ -51551,9 +54263,9 @@ diff -urNp linux-3.0.3/include/linux/blkdev.h linux-3.0.3/include/linux/blkdev.h
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
  				 unsigned long);
-diff -urNp linux-3.0.3/include/linux/blktrace_api.h linux-3.0.3/include/linux/blktrace_api.h
---- linux-3.0.3/include/linux/blktrace_api.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/blktrace_api.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/blktrace_api.h linux-3.0.4/include/linux/blktrace_api.h
+--- linux-3.0.4/include/linux/blktrace_api.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/blktrace_api.h	2011-08-23 21:47:56.000000000 -0400
 @@ -161,7 +161,7 @@ struct blk_trace {
  	struct dentry *dir;
  	struct dentry *dropped_file;
@@ -51563,9 +54275,9 @@ diff -urNp linux-3.0.3/include/linux/blktrace_api.h linux-3.0.3/include/linux/bl
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-3.0.3/include/linux/byteorder/little_endian.h linux-3.0.3/include/linux/byteorder/little_endian.h
---- linux-3.0.3/include/linux/byteorder/little_endian.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/byteorder/little_endian.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/byteorder/little_endian.h linux-3.0.4/include/linux/byteorder/little_endian.h
+--- linux-3.0.4/include/linux/byteorder/little_endian.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/byteorder/little_endian.h	2011-08-23 21:47:56.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -51630,9 +54342,9 @@ diff -urNp linux-3.0.3/include/linux/byteorder/little_endian.h linux-3.0.3/inclu
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-3.0.3/include/linux/cache.h linux-3.0.3/include/linux/cache.h
---- linux-3.0.3/include/linux/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/cache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/cache.h linux-3.0.4/include/linux/cache.h
+--- linux-3.0.4/include/linux/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/cache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -51644,9 +54356,9 @@ diff -urNp linux-3.0.3/include/linux/cache.h linux-3.0.3/include/linux/cache.h
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-3.0.3/include/linux/capability.h linux-3.0.3/include/linux/capability.h
---- linux-3.0.3/include/linux/capability.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/capability.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/capability.h linux-3.0.4/include/linux/capability.h
+--- linux-3.0.4/include/linux/capability.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/capability.h	2011-08-23 21:48:14.000000000 -0400
 @@ -547,6 +547,9 @@ extern bool capable(int cap);
  extern bool ns_capable(struct user_namespace *ns, int cap);
  extern bool task_ns_capable(struct task_struct *t, int cap);
@@ -51657,9 +54369,9 @@ diff -urNp linux-3.0.3/include/linux/capability.h linux-3.0.3/include/linux/capa
  
  /* audit system wants to get cap info from files as well */
  extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
-diff -urNp linux-3.0.3/include/linux/cleancache.h linux-3.0.3/include/linux/cleancache.h
---- linux-3.0.3/include/linux/cleancache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/cleancache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/cleancache.h linux-3.0.4/include/linux/cleancache.h
+--- linux-3.0.4/include/linux/cleancache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/cleancache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -31,7 +31,7 @@ struct cleancache_ops {
  	void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
  	void (*flush_inode)(int, struct cleancache_filekey);
@@ -51669,9 +54381,9 @@ diff -urNp linux-3.0.3/include/linux/cleancache.h linux-3.0.3/include/linux/clea
  
  extern struct cleancache_ops
  	cleancache_register_ops(struct cleancache_ops *ops);
-diff -urNp linux-3.0.3/include/linux/compiler-gcc4.h linux-3.0.3/include/linux/compiler-gcc4.h
---- linux-3.0.3/include/linux/compiler-gcc4.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/compiler-gcc4.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/compiler-gcc4.h linux-3.0.4/include/linux/compiler-gcc4.h
+--- linux-3.0.4/include/linux/compiler-gcc4.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/compiler-gcc4.h	2011-08-26 19:49:56.000000000 -0400
 @@ -31,6 +31,12 @@
  
  
@@ -51697,9 +54409,9 @@ diff -urNp linux-3.0.3/include/linux/compiler-gcc4.h linux-3.0.3/include/linux/c
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-3.0.3/include/linux/compiler.h linux-3.0.3/include/linux/compiler.h
---- linux-3.0.3/include/linux/compiler.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/compiler.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compiler.h
+--- linux-3.0.4/include/linux/compiler.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/compiler.h	2011-08-26 19:49:56.000000000 -0400
 @@ -264,6 +264,14 @@ void ftrace_likely_update(struct ftrace_
  # define __attribute_const__	/* unimplemented */
  #endif
@@ -51747,9 +54459,9 @@ diff -urNp linux-3.0.3/include/linux/compiler.h linux-3.0.3/include/linux/compil
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.0.3/include/linux/cpuset.h linux-3.0.3/include/linux/cpuset.h
---- linux-3.0.3/include/linux/cpuset.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/cpuset.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/cpuset.h linux-3.0.4/include/linux/cpuset.h
+--- linux-3.0.4/include/linux/cpuset.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/cpuset.h	2011-08-23 21:47:56.000000000 -0400
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
  	 * nodemask.
  	 */
@@ -51759,9 +54471,9 @@ diff -urNp linux-3.0.3/include/linux/cpuset.h linux-3.0.3/include/linux/cpuset.h
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-3.0.3/include/linux/crypto.h linux-3.0.3/include/linux/crypto.h
---- linux-3.0.3/include/linux/crypto.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/crypto.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/crypto.h linux-3.0.4/include/linux/crypto.h
+--- linux-3.0.4/include/linux/crypto.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/crypto.h	2011-08-23 21:47:56.000000000 -0400
 @@ -361,7 +361,7 @@ struct cipher_tfm {
  	                  const u8 *key, unsigned int keylen);
  	void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -51787,9 +54499,9 @@ diff -urNp linux-3.0.3/include/linux/crypto.h linux-3.0.3/include/linux/crypto.h
  
  #define crt_ablkcipher	crt_u.ablkcipher
  #define crt_aead	crt_u.aead
-diff -urNp linux-3.0.3/include/linux/decompress/mm.h linux-3.0.3/include/linux/decompress/mm.h
---- linux-3.0.3/include/linux/decompress/mm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/decompress/mm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/decompress/mm.h linux-3.0.4/include/linux/decompress/mm.h
+--- linux-3.0.4/include/linux/decompress/mm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/decompress/mm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -51799,9 +54511,9 @@ diff -urNp linux-3.0.3/include/linux/decompress/mm.h linux-3.0.3/include/linux/d
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-3.0.3/include/linux/dma-mapping.h linux-3.0.3/include/linux/dma-mapping.h
---- linux-3.0.3/include/linux/dma-mapping.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/dma-mapping.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/dma-mapping.h linux-3.0.4/include/linux/dma-mapping.h
+--- linux-3.0.4/include/linux/dma-mapping.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/dma-mapping.h	2011-08-26 19:49:56.000000000 -0400
 @@ -50,7 +50,7 @@ struct dma_map_ops {
  	int (*dma_supported)(struct device *dev, u64 mask);
  	int (*set_dma_mask)(struct device *dev, u64 mask);
@@ -51811,9 +54523,9 @@ diff -urNp linux-3.0.3/include/linux/dma-mapping.h linux-3.0.3/include/linux/dma
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  
-diff -urNp linux-3.0.3/include/linux/efi.h linux-3.0.3/include/linux/efi.h
---- linux-3.0.3/include/linux/efi.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/efi.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/efi.h linux-3.0.4/include/linux/efi.h
+--- linux-3.0.4/include/linux/efi.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/efi.h	2011-08-23 21:47:56.000000000 -0400
 @@ -410,7 +410,7 @@ struct efivar_operations {
  	efi_get_variable_t *get_variable;
  	efi_get_next_variable_t *get_next_variable;
@@ -51823,9 +54535,9 @@ diff -urNp linux-3.0.3/include/linux/efi.h linux-3.0.3/include/linux/efi.h
  
  struct efivars {
  	/*
-diff -urNp linux-3.0.3/include/linux/elf.h linux-3.0.3/include/linux/elf.h
---- linux-3.0.3/include/linux/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/elf.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/elf.h linux-3.0.4/include/linux/elf.h
+--- linux-3.0.4/include/linux/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/elf.h	2011-08-23 21:47:56.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -51898,9 +54610,9 @@ diff -urNp linux-3.0.3/include/linux/elf.h linux-3.0.3/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-3.0.3/include/linux/firewire.h linux-3.0.3/include/linux/firewire.h
---- linux-3.0.3/include/linux/firewire.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/firewire.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/firewire.h linux-3.0.4/include/linux/firewire.h
+--- linux-3.0.4/include/linux/firewire.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/firewire.h	2011-08-23 21:47:56.000000000 -0400
 @@ -428,7 +428,7 @@ struct fw_iso_context {
  	union {
  		fw_iso_callback_t sc;
@@ -51910,9 +54622,9 @@ diff -urNp linux-3.0.3/include/linux/firewire.h linux-3.0.3/include/linux/firewi
  	void *callback_data;
  };
  
-diff -urNp linux-3.0.3/include/linux/fscache-cache.h linux-3.0.3/include/linux/fscache-cache.h
---- linux-3.0.3/include/linux/fscache-cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fscache-cache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fscache-cache.h linux-3.0.4/include/linux/fscache-cache.h
+--- linux-3.0.4/include/linux/fscache-cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fscache-cache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -102,7 +102,7 @@ struct fscache_operation {
  	fscache_operation_release_t release;
  };
@@ -51931,9 +54643,9 @@ diff -urNp linux-3.0.3/include/linux/fscache-cache.h linux-3.0.3/include/linux/f
  	op->processor = processor;
  	op->release = release;
  	INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-3.0.3/include/linux/fs.h linux-3.0.3/include/linux/fs.h
---- linux-3.0.3/include/linux/fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fs.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fs.h linux-3.0.4/include/linux/fs.h
+--- linux-3.0.4/include/linux/fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fs.h	2011-08-26 19:49:56.000000000 -0400
 @@ -109,6 +109,11 @@ struct inodes_stat_t {
  /* File was opened by fanotify and shouldn't generate fanotify events */
  #define FMODE_NONOTIFY		((__force fmode_t)0x1000000)
@@ -51956,9 +54668,9 @@ diff -urNp linux-3.0.3/include/linux/fs.h linux-3.0.3/include/linux/fs.h
  
  #define IPERM_FLAG_RCU	0x0001
  
-diff -urNp linux-3.0.3/include/linux/fsnotify.h linux-3.0.3/include/linux/fsnotify.h
---- linux-3.0.3/include/linux/fsnotify.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fsnotify.h	2011-08-24 18:10:29.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fsnotify.h linux-3.0.4/include/linux/fsnotify.h
+--- linux-3.0.4/include/linux/fsnotify.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fsnotify.h	2011-08-24 18:10:29.000000000 -0400
 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
   */
  static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
@@ -51968,9 +54680,9 @@ diff -urNp linux-3.0.3/include/linux/fsnotify.h linux-3.0.3/include/linux/fsnoti
  }
  
  /*
-diff -urNp linux-3.0.3/include/linux/fs_struct.h linux-3.0.3/include/linux/fs_struct.h
---- linux-3.0.3/include/linux/fs_struct.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fs_struct.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fs_struct.h linux-3.0.4/include/linux/fs_struct.h
+--- linux-3.0.4/include/linux/fs_struct.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fs_struct.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -51980,9 +54692,9 @@ diff -urNp linux-3.0.3/include/linux/fs_struct.h linux-3.0.3/include/linux/fs_st
  	spinlock_t lock;
  	seqcount_t seq;
  	int umask;
-diff -urNp linux-3.0.3/include/linux/ftrace_event.h linux-3.0.3/include/linux/ftrace_event.h
---- linux-3.0.3/include/linux/ftrace_event.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/ftrace_event.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ftrace_event.h
+--- linux-3.0.4/include/linux/ftrace_event.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/ftrace_event.h	2011-08-23 21:47:56.000000000 -0400
 @@ -96,7 +96,7 @@ struct trace_event_functions {
  	trace_print_func	raw;
  	trace_print_func	hex;
@@ -52001,9 +54713,9 @@ diff -urNp linux-3.0.3/include/linux/ftrace_event.h linux-3.0.3/include/linux/ft
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-3.0.3/include/linux/genhd.h linux-3.0.3/include/linux/genhd.h
---- linux-3.0.3/include/linux/genhd.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/genhd.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/genhd.h linux-3.0.4/include/linux/genhd.h
+--- linux-3.0.4/include/linux/genhd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/genhd.h	2011-08-23 21:47:56.000000000 -0400
 @@ -184,7 +184,7 @@ struct gendisk {
  	struct kobject *slave_dir;
  
@@ -52013,9 +54725,9 @@ diff -urNp linux-3.0.3/include/linux/genhd.h linux-3.0.3/include/linux/genhd.h
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-3.0.3/include/linux/gracl.h linux-3.0.3/include/linux/gracl.h
---- linux-3.0.3/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/gracl.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/gracl.h linux-3.0.4/include/linux/gracl.h
+--- linux-3.0.4/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/gracl.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -52334,9 +55046,9 @@ diff -urNp linux-3.0.3/include/linux/gracl.h linux-3.0.3/include/linux/gracl.h
 +
 +#endif
 +
-diff -urNp linux-3.0.3/include/linux/gralloc.h linux-3.0.3/include/linux/gralloc.h
---- linux-3.0.3/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/gralloc.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/gralloc.h linux-3.0.4/include/linux/gralloc.h
+--- linux-3.0.4/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/gralloc.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -52347,9 +55059,9 @@ diff -urNp linux-3.0.3/include/linux/gralloc.h linux-3.0.3/include/linux/gralloc
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grdefs.h linux-3.0.3/include/linux/grdefs.h
---- linux-3.0.3/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grdefs.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
+--- linux-3.0.4/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grdefs.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -52491,9 +55203,9 @@ diff -urNp linux-3.0.3/include/linux/grdefs.h linux-3.0.3/include/linux/grdefs.h
 +};
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grinternal.h linux-3.0.3/include/linux/grinternal.h
---- linux-3.0.3/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grinternal.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grinternal.h
+--- linux-3.0.4/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grinternal.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -52714,9 +55426,9 @@ diff -urNp linux-3.0.3/include/linux/grinternal.h linux-3.0.3/include/linux/grin
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grmsg.h linux-3.0.3/include/linux/grmsg.h
---- linux-3.0.3/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grmsg.h	2011-08-25 17:27:26.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grmsg.h linux-3.0.4/include/linux/grmsg.h
+--- linux-3.0.4/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grmsg.h	2011-08-25 17:27:26.000000000 -0400
 @@ -0,0 +1,107 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -52825,9 +55537,9 @@ diff -urNp linux-3.0.3/include/linux/grmsg.h linux-3.0.3/include/linux/grmsg.h
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-3.0.3/include/linux/grsecurity.h linux-3.0.3/include/linux/grsecurity.h
---- linux-3.0.3/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grsecurity.h	2011-08-25 17:27:36.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grsecurity.h
+--- linux-3.0.4/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grsecurity.h	2011-08-25 17:27:36.000000000 -0400
 @@ -0,0 +1,227 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
@@ -53056,9 +55768,9 @@ diff -urNp linux-3.0.3/include/linux/grsecurity.h linux-3.0.3/include/linux/grse
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grsock.h linux-3.0.3/include/linux/grsock.h
---- linux-3.0.3/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grsock.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grsock.h linux-3.0.4/include/linux/grsock.h
+--- linux-3.0.4/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grsock.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -53079,9 +55791,9 @@ diff -urNp linux-3.0.3/include/linux/grsock.h linux-3.0.3/include/linux/grsock.h
 +			    const int protocol);
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/hid.h linux-3.0.3/include/linux/hid.h
---- linux-3.0.3/include/linux/hid.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/hid.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/hid.h linux-3.0.4/include/linux/hid.h
+--- linux-3.0.4/include/linux/hid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/hid.h	2011-08-23 21:47:56.000000000 -0400
 @@ -675,7 +675,7 @@ struct hid_ll_driver {
  			unsigned int code, int value);
  
@@ -53091,9 +55803,9 @@ diff -urNp linux-3.0.3/include/linux/hid.h linux-3.0.3/include/linux/hid.h
  
  #define	PM_HINT_FULLON	1<<5
  #define PM_HINT_NORMAL	1<<1
-diff -urNp linux-3.0.3/include/linux/highmem.h linux-3.0.3/include/linux/highmem.h
---- linux-3.0.3/include/linux/highmem.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/highmem.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/highmem.h linux-3.0.4/include/linux/highmem.h
+--- linux-3.0.4/include/linux/highmem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/highmem.h	2011-08-23 21:47:56.000000000 -0400
 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
@@ -53113,9 +55825,9 @@ diff -urNp linux-3.0.3/include/linux/highmem.h linux-3.0.3/include/linux/highmem
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-3.0.3/include/linux/i2c.h linux-3.0.3/include/linux/i2c.h
---- linux-3.0.3/include/linux/i2c.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/i2c.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/i2c.h linux-3.0.4/include/linux/i2c.h
+--- linux-3.0.4/include/linux/i2c.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/i2c.h	2011-08-23 21:47:56.000000000 -0400
 @@ -346,6 +346,7 @@ struct i2c_algorithm {
  	/* To determine what the adapter supports */
  	u32 (*functionality) (struct i2c_adapter *);
@@ -53124,9 +55836,9 @@ diff -urNp linux-3.0.3/include/linux/i2c.h linux-3.0.3/include/linux/i2c.h
  
  /*
   * i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-3.0.3/include/linux/i2o.h linux-3.0.3/include/linux/i2o.h
---- linux-3.0.3/include/linux/i2o.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/i2o.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/i2o.h linux-3.0.4/include/linux/i2o.h
+--- linux-3.0.4/include/linux/i2o.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/i2o.h	2011-08-23 21:47:56.000000000 -0400
 @@ -564,7 +564,7 @@ struct i2o_controller {
  	struct i2o_device *exec;	/* Executive */
  #if BITS_PER_LONG == 64
@@ -53136,9 +55848,9 @@ diff -urNp linux-3.0.3/include/linux/i2o.h linux-3.0.3/include/linux/i2o.h
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff -urNp linux-3.0.3/include/linux/init.h linux-3.0.3/include/linux/init.h
---- linux-3.0.3/include/linux/init.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/init.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/init.h linux-3.0.4/include/linux/init.h
+--- linux-3.0.4/include/linux/init.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/init.h	2011-08-23 21:47:56.000000000 -0400
 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
@@ -53155,9 +55867,9 @@ diff -urNp linux-3.0.3/include/linux/init.h linux-3.0.3/include/linux/init.h
  	{ return exitfn; }					\
  	void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-3.0.3/include/linux/init_task.h linux-3.0.3/include/linux/init_task.h
---- linux-3.0.3/include/linux/init_task.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/init_task.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/init_task.h linux-3.0.4/include/linux/init_task.h
+--- linux-3.0.4/include/linux/init_task.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/init_task.h	2011-08-23 21:47:56.000000000 -0400
 @@ -126,6 +126,12 @@ extern struct cred init_cred;
  # define INIT_PERF_EVENTS(tsk)
  #endif
@@ -53179,9 +55891,9 @@ diff -urNp linux-3.0.3/include/linux/init_task.h linux-3.0.3/include/linux/init_
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-3.0.3/include/linux/intel-iommu.h linux-3.0.3/include/linux/intel-iommu.h
---- linux-3.0.3/include/linux/intel-iommu.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/intel-iommu.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/intel-iommu.h linux-3.0.4/include/linux/intel-iommu.h
+--- linux-3.0.4/include/linux/intel-iommu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/intel-iommu.h	2011-08-23 21:47:56.000000000 -0400
 @@ -296,7 +296,7 @@ struct iommu_flush {
  			      u8 fm, u64 type);
  	void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -53191,9 +55903,9 @@ diff -urNp linux-3.0.3/include/linux/intel-iommu.h linux-3.0.3/include/linux/int
  
  enum {
  	SR_DMAR_FECTL_REG,
-diff -urNp linux-3.0.3/include/linux/interrupt.h linux-3.0.3/include/linux/interrupt.h
---- linux-3.0.3/include/linux/interrupt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/interrupt.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/interrupt.h
+--- linux-3.0.4/include/linux/interrupt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/interrupt.h	2011-08-23 21:47:56.000000000 -0400
 @@ -422,7 +422,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -53218,9 +55930,9 @@ diff -urNp linux-3.0.3/include/linux/interrupt.h linux-3.0.3/include/linux/inter
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-3.0.3/include/linux/kallsyms.h linux-3.0.3/include/linux/kallsyms.h
---- linux-3.0.3/include/linux/kallsyms.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kallsyms.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kallsyms.h linux-3.0.4/include/linux/kallsyms.h
+--- linux-3.0.4/include/linux/kallsyms.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kallsyms.h	2011-08-23 21:48:14.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -53248,9 +55960,9 @@ diff -urNp linux-3.0.3/include/linux/kallsyms.h linux-3.0.3/include/linux/kallsy
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-3.0.3/include/linux/kgdb.h linux-3.0.3/include/linux/kgdb.h
---- linux-3.0.3/include/linux/kgdb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kgdb.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kgdb.h linux-3.0.4/include/linux/kgdb.h
+--- linux-3.0.4/include/linux/kgdb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kgdb.h	2011-08-26 19:49:56.000000000 -0400
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -53278,9 +55990,9 @@ diff -urNp linux-3.0.3/include/linux/kgdb.h linux-3.0.3/include/linux/kgdb.h
  
  extern struct kgdb_arch		arch_kgdb_ops;
  
-diff -urNp linux-3.0.3/include/linux/kmod.h linux-3.0.3/include/linux/kmod.h
---- linux-3.0.3/include/linux/kmod.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kmod.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kmod.h linux-3.0.4/include/linux/kmod.h
+--- linux-3.0.4/include/linux/kmod.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kmod.h	2011-08-23 21:48:14.000000000 -0400
 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -53290,9 +56002,9 @@ diff -urNp linux-3.0.3/include/linux/kmod.h linux-3.0.3/include/linux/kmod.h
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff -urNp linux-3.0.3/include/linux/kvm_host.h linux-3.0.3/include/linux/kvm_host.h
---- linux-3.0.3/include/linux/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kvm_host.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_host.h
+--- linux-3.0.4/include/linux/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kvm_host.h	2011-08-23 21:47:56.000000000 -0400
 @@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
@@ -53311,9 +56023,9 @@ diff -urNp linux-3.0.3/include/linux/kvm_host.h linux-3.0.3/include/linux/kvm_ho
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-3.0.3/include/linux/libata.h linux-3.0.3/include/linux/libata.h
---- linux-3.0.3/include/linux/libata.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/libata.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/libata.h linux-3.0.4/include/linux/libata.h
+--- linux-3.0.4/include/linux/libata.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/libata.h	2011-08-26 19:49:56.000000000 -0400
 @@ -899,7 +899,7 @@ struct ata_port_operations {
  	 * fields must be pointers.
  	 */
@@ -53323,9 +56035,9 @@ diff -urNp linux-3.0.3/include/linux/libata.h linux-3.0.3/include/linux/libata.h
  
  struct ata_port_info {
  	unsigned long		flags;
-diff -urNp linux-3.0.3/include/linux/mca.h linux-3.0.3/include/linux/mca.h
---- linux-3.0.3/include/linux/mca.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mca.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mca.h linux-3.0.4/include/linux/mca.h
+--- linux-3.0.4/include/linux/mca.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mca.h	2011-08-23 21:47:56.000000000 -0400
 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
  						  int region);
  	void *		(*mca_transform_memory)(struct mca_device *,
@@ -53335,9 +56047,9 @@ diff -urNp linux-3.0.3/include/linux/mca.h linux-3.0.3/include/linux/mca.h
  
  struct mca_bus {
  	u64			default_dma_mask;
-diff -urNp linux-3.0.3/include/linux/memory.h linux-3.0.3/include/linux/memory.h
---- linux-3.0.3/include/linux/memory.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/memory.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/memory.h linux-3.0.4/include/linux/memory.h
+--- linux-3.0.4/include/linux/memory.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/memory.h	2011-08-23 21:47:56.000000000 -0400
 @@ -144,7 +144,7 @@ struct memory_accessor {
  			size_t count);
  	ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -53347,9 +56059,9 @@ diff -urNp linux-3.0.3/include/linux/memory.h linux-3.0.3/include/linux/memory.h
  
  /*
   * Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-3.0.3/include/linux/mfd/abx500.h linux-3.0.3/include/linux/mfd/abx500.h
---- linux-3.0.3/include/linux/mfd/abx500.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mfd/abx500.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mfd/abx500.h linux-3.0.4/include/linux/mfd/abx500.h
+--- linux-3.0.4/include/linux/mfd/abx500.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mfd/abx500.h	2011-08-23 21:47:56.000000000 -0400
 @@ -234,6 +234,7 @@ struct abx500_ops {
  	int (*event_registers_startup_state_get) (struct device *, u8 *);
  	int (*startup_irq_enabled) (struct device *, unsigned int);
@@ -53358,9 +56070,9 @@ diff -urNp linux-3.0.3/include/linux/mfd/abx500.h linux-3.0.3/include/linux/mfd/
  
  int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
  void abx500_remove_ops(struct device *dev);
-diff -urNp linux-3.0.3/include/linux/mm.h linux-3.0.3/include/linux/mm.h
---- linux-3.0.3/include/linux/mm.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/include/linux/mm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
+--- linux-3.0.4/include/linux/mm.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/include/linux/mm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
@@ -53483,9 +56195,9 @@ diff -urNp linux-3.0.3/include/linux/mm.h linux-3.0.3/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-3.0.3/include/linux/mm_types.h linux-3.0.3/include/linux/mm_types.h
---- linux-3.0.3/include/linux/mm_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mm_types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_types.h
+--- linux-3.0.4/include/linux/mm_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mm_types.h	2011-08-23 21:47:56.000000000 -0400
 @@ -184,6 +184,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
@@ -53520,9 +56232,9 @@ diff -urNp linux-3.0.3/include/linux/mm_types.h linux-3.0.3/include/linux/mm_typ
  };
  
  static inline void mm_init_cpumask(struct mm_struct *mm)
-diff -urNp linux-3.0.3/include/linux/mmu_notifier.h linux-3.0.3/include/linux/mmu_notifier.h
---- linux-3.0.3/include/linux/mmu_notifier.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mmu_notifier.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mmu_notifier.h linux-3.0.4/include/linux/mmu_notifier.h
+--- linux-3.0.4/include/linux/mmu_notifier.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mmu_notifier.h	2011-08-23 21:47:56.000000000 -0400
 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
@@ -53539,9 +56251,9 @@ diff -urNp linux-3.0.3/include/linux/mmu_notifier.h linux-3.0.3/include/linux/mm
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)		\
-diff -urNp linux-3.0.3/include/linux/mmzone.h linux-3.0.3/include/linux/mmzone.h
---- linux-3.0.3/include/linux/mmzone.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mmzone.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mmzone.h linux-3.0.4/include/linux/mmzone.h
+--- linux-3.0.4/include/linux/mmzone.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mmzone.h	2011-08-23 21:47:56.000000000 -0400
 @@ -350,7 +350,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
@@ -53551,9 +56263,9 @@ diff -urNp linux-3.0.3/include/linux/mmzone.h linux-3.0.3/include/linux/mmzone.h
  
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-3.0.3/include/linux/mod_devicetable.h linux-3.0.3/include/linux/mod_devicetable.h
---- linux-3.0.3/include/linux/mod_devicetable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mod_devicetable.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mod_devicetable.h linux-3.0.4/include/linux/mod_devicetable.h
+--- linux-3.0.4/include/linux/mod_devicetable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mod_devicetable.h	2011-08-23 21:47:56.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -53572,9 +56284,9 @@ diff -urNp linux-3.0.3/include/linux/mod_devicetable.h linux-3.0.3/include/linux
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-3.0.3/include/linux/module.h linux-3.0.3/include/linux/module.h
---- linux-3.0.3/include/linux/module.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/module.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
+--- linux-3.0.4/include/linux/module.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/module.h	2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/kobject.h>
  #include <linux/moduleparam.h>
@@ -53669,9 +56381,9 @@ diff -urNp linux-3.0.3/include/linux/module.h linux-3.0.3/include/linux/module.h
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-3.0.3/include/linux/moduleloader.h linux-3.0.3/include/linux/moduleloader.h
---- linux-3.0.3/include/linux/moduleloader.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/moduleloader.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/moduleloader.h linux-3.0.4/include/linux/moduleloader.h
+--- linux-3.0.4/include/linux/moduleloader.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/moduleloader.h	2011-08-23 21:47:56.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -53694,9 +56406,9 @@ diff -urNp linux-3.0.3/include/linux/moduleloader.h linux-3.0.3/include/linux/mo
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-3.0.3/include/linux/moduleparam.h linux-3.0.3/include/linux/moduleparam.h
---- linux-3.0.3/include/linux/moduleparam.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/moduleparam.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/moduleparam.h linux-3.0.4/include/linux/moduleparam.h
+--- linux-3.0.4/include/linux/moduleparam.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/moduleparam.h	2011-08-23 21:47:56.000000000 -0400
 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -53715,9 +56427,9 @@ diff -urNp linux-3.0.3/include/linux/moduleparam.h linux-3.0.3/include/linux/mod
  	= { .max = ARRAY_SIZE(array), .num = nump,                      \
  	    .ops = &param_ops_##type,					\
  	    .elemsize = sizeof(array[0]), .elem = array };		\
-diff -urNp linux-3.0.3/include/linux/namei.h linux-3.0.3/include/linux/namei.h
---- linux-3.0.3/include/linux/namei.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/namei.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
+--- linux-3.0.4/include/linux/namei.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/namei.h	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@ struct nameidata {
  	unsigned	seq;
  	int		last_type;
@@ -53742,9 +56454,9 @@ diff -urNp linux-3.0.3/include/linux/namei.h linux-3.0.3/include/linux/namei.h
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-3.0.3/include/linux/netdevice.h linux-3.0.3/include/linux/netdevice.h
---- linux-3.0.3/include/linux/netdevice.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/include/linux/netdevice.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/netdevice.h linux-3.0.4/include/linux/netdevice.h
+--- linux-3.0.4/include/linux/netdevice.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/include/linux/netdevice.h	2011-08-23 21:47:56.000000000 -0400
 @@ -979,6 +979,7 @@ struct net_device_ops {
  	int			(*ndo_set_features)(struct net_device *dev,
  						    u32 features);
@@ -53753,9 +56465,9 @@ diff -urNp linux-3.0.3/include/linux/netdevice.h linux-3.0.3/include/linux/netde
  
  /*
   *	The DEVICE structure.
-diff -urNp linux-3.0.3/include/linux/netfilter/xt_gradm.h linux-3.0.3/include/linux/netfilter/xt_gradm.h
---- linux-3.0.3/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/netfilter/xt_gradm.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/linux/netfilter/xt_gradm.h
+--- linux-3.0.4/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/netfilter/xt_gradm.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -53766,9 +56478,21 @@ diff -urNp linux-3.0.3/include/linux/netfilter/xt_gradm.h linux-3.0.3/include/li
 +};
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/oprofile.h linux-3.0.3/include/linux/oprofile.h
---- linux-3.0.3/include/linux/oprofile.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/oprofile.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/of_pdt.h linux-3.0.4/include/linux/of_pdt.h
+--- linux-3.0.4/include/linux/of_pdt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/of_pdt.h	2011-08-30 06:20:11.000000000 -0400
+@@ -32,7 +32,7 @@ struct of_pdt_ops {
+ 
+ 	/* return 0 on success; fill in 'len' with number of bytes in path */
+ 	int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
+-};
++} __no_const;
+ 
+ extern void *prom_early_alloc(unsigned long size);
+ 
+diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofile.h
+--- linux-3.0.4/include/linux/oprofile.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/oprofile.h	2011-08-23 21:47:56.000000000 -0400
 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
  	char const * name, ulong * val);
@@ -53781,9 +56505,9 @@ diff -urNp linux-3.0.3/include/linux/oprofile.h linux-3.0.3/include/linux/oprofi
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-3.0.3/include/linux/padata.h linux-3.0.3/include/linux/padata.h
---- linux-3.0.3/include/linux/padata.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/padata.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/padata.h linux-3.0.4/include/linux/padata.h
+--- linux-3.0.4/include/linux/padata.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/padata.h	2011-08-23 21:47:56.000000000 -0400
 @@ -129,7 +129,7 @@ struct parallel_data {
  	struct padata_instance		*pinst;
  	struct padata_parallel_queue	__percpu *pqueue;
@@ -53793,9 +56517,9 @@ diff -urNp linux-3.0.3/include/linux/padata.h linux-3.0.3/include/linux/padata.h
  	atomic_t			reorder_objects;
  	atomic_t			refcnt;
  	unsigned int			max_seq_nr;
-diff -urNp linux-3.0.3/include/linux/perf_event.h linux-3.0.3/include/linux/perf_event.h
---- linux-3.0.3/include/linux/perf_event.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/perf_event.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf_event.h
+--- linux-3.0.4/include/linux/perf_event.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/perf_event.h	2011-08-23 21:47:56.000000000 -0400
 @@ -761,8 +761,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
@@ -53818,9 +56542,9 @@ diff -urNp linux-3.0.3/include/linux/perf_event.h linux-3.0.3/include/linux/perf
  
  	/*
  	 * Protect attach/detach and child_list:
-diff -urNp linux-3.0.3/include/linux/pipe_fs_i.h linux-3.0.3/include/linux/pipe_fs_i.h
---- linux-3.0.3/include/linux/pipe_fs_i.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/pipe_fs_i.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/pipe_fs_i.h linux-3.0.4/include/linux/pipe_fs_i.h
+--- linux-3.0.4/include/linux/pipe_fs_i.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/pipe_fs_i.h	2011-08-23 21:47:56.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
  	wait_queue_head_t wait;
@@ -53834,9 +56558,9 @@ diff -urNp linux-3.0.3/include/linux/pipe_fs_i.h linux-3.0.3/include/linux/pipe_
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct page *tmp_page;
-diff -urNp linux-3.0.3/include/linux/pm_runtime.h linux-3.0.3/include/linux/pm_runtime.h
---- linux-3.0.3/include/linux/pm_runtime.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/pm_runtime.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/pm_runtime.h linux-3.0.4/include/linux/pm_runtime.h
+--- linux-3.0.4/include/linux/pm_runtime.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/pm_runtime.h	2011-08-23 21:47:56.000000000 -0400
 @@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
@@ -53846,9 +56570,9 @@ diff -urNp linux-3.0.3/include/linux/pm_runtime.h linux-3.0.3/include/linux/pm_r
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-3.0.3/include/linux/poison.h linux-3.0.3/include/linux/poison.h
---- linux-3.0.3/include/linux/poison.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/poison.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/poison.h linux-3.0.4/include/linux/poison.h
+--- linux-3.0.4/include/linux/poison.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/poison.h	2011-08-23 21:47:56.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -53860,9 +56584,9 @@ diff -urNp linux-3.0.3/include/linux/poison.h linux-3.0.3/include/linux/poison.h
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-3.0.3/include/linux/preempt.h linux-3.0.3/include/linux/preempt.h
---- linux-3.0.3/include/linux/preempt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/preempt.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/preempt.h linux-3.0.4/include/linux/preempt.h
+--- linux-3.0.4/include/linux/preempt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/preempt.h	2011-08-23 21:47:56.000000000 -0400
 @@ -115,7 +115,7 @@ struct preempt_ops {
  	void (*sched_in)(struct preempt_notifier *notifier, int cpu);
  	void (*sched_out)(struct preempt_notifier *notifier,
@@ -53872,9 +56596,9 @@ diff -urNp linux-3.0.3/include/linux/preempt.h linux-3.0.3/include/linux/preempt
  
  /**
   * preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-3.0.3/include/linux/proc_fs.h linux-3.0.3/include/linux/proc_fs.h
---- linux-3.0.3/include/linux/proc_fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/proc_fs.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/proc_fs.h linux-3.0.4/include/linux/proc_fs.h
+--- linux-3.0.4/include/linux/proc_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/proc_fs.h	2011-08-23 21:48:14.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -53904,9 +56628,9 @@ diff -urNp linux-3.0.3/include/linux/proc_fs.h linux-3.0.3/include/linux/proc_fs
  
  struct ctl_table_header;
  struct ctl_table;
-diff -urNp linux-3.0.3/include/linux/ptrace.h linux-3.0.3/include/linux/ptrace.h
---- linux-3.0.3/include/linux/ptrace.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/ptrace.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/ptrace.h linux-3.0.4/include/linux/ptrace.h
+--- linux-3.0.4/include/linux/ptrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/ptrace.h	2011-08-23 21:48:14.000000000 -0400
 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
@@ -53920,9 +56644,9 @@ diff -urNp linux-3.0.3/include/linux/ptrace.h linux-3.0.3/include/linux/ptrace.h
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-3.0.3/include/linux/random.h linux-3.0.3/include/linux/random.h
---- linux-3.0.3/include/linux/random.h	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/include/linux/random.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/random.h linux-3.0.4/include/linux/random.h
+--- linux-3.0.4/include/linux/random.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/include/linux/random.h	2011-08-23 21:47:56.000000000 -0400
 @@ -69,12 +69,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -53942,9 +56666,9 @@ diff -urNp linux-3.0.3/include/linux/random.h linux-3.0.3/include/linux/random.h
  }
  
  /**
-diff -urNp linux-3.0.3/include/linux/reboot.h linux-3.0.3/include/linux/reboot.h
---- linux-3.0.3/include/linux/reboot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/reboot.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
+--- linux-3.0.4/include/linux/reboot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/reboot.h	2011-08-23 21:47:56.000000000 -0400
 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
@@ -53980,9 +56704,9 @@ diff -urNp linux-3.0.3/include/linux/reboot.h linux-3.0.3/include/linux/reboot.h
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3/include/linux/reiserfs_fs.h
---- linux-3.0.3/include/linux/reiserfs_fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/reiserfs_fs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4/include/linux/reiserfs_fs.h
+--- linux-3.0.4/include/linux/reiserfs_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/reiserfs_fs.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
@@ -53992,9 +56716,9 @@ diff -urNp linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3/include/linux/rei
  #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
  #define __fs_changed(gen,s) (gen != get_generation (s))
  #define fs_changed(gen,s)		\
-diff -urNp linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3/include/linux/reiserfs_fs_sb.h
---- linux-3.0.3/include/linux/reiserfs_fs_sb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/reiserfs_fs_sb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.4/include/linux/reiserfs_fs_sb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/reiserfs_fs_sb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -54004,9 +56728,9 @@ diff -urNp linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3/include/linux/
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-3.0.3/include/linux/relay.h linux-3.0.3/include/linux/relay.h
---- linux-3.0.3/include/linux/relay.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/relay.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/relay.h linux-3.0.4/include/linux/relay.h
+--- linux-3.0.4/include/linux/relay.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/relay.h	2011-08-23 21:47:56.000000000 -0400
 @@ -159,7 +159,7 @@ struct rchan_callbacks
  	 * The callback should return 0 if successful, negative if not.
  	 */
@@ -54016,9 +56740,9 @@ diff -urNp linux-3.0.3/include/linux/relay.h linux-3.0.3/include/linux/relay.h
  
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-3.0.3/include/linux/rfkill.h linux-3.0.3/include/linux/rfkill.h
---- linux-3.0.3/include/linux/rfkill.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/rfkill.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/rfkill.h linux-3.0.4/include/linux/rfkill.h
+--- linux-3.0.4/include/linux/rfkill.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/rfkill.h	2011-08-23 21:47:56.000000000 -0400
 @@ -147,6 +147,7 @@ struct rfkill_ops {
  	void	(*query)(struct rfkill *rfkill, void *data);
  	int	(*set_block)(void *data, bool blocked);
@@ -54027,9 +56751,9 @@ diff -urNp linux-3.0.3/include/linux/rfkill.h linux-3.0.3/include/linux/rfkill.h
  
  #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  /**
-diff -urNp linux-3.0.3/include/linux/rmap.h linux-3.0.3/include/linux/rmap.h
---- linux-3.0.3/include/linux/rmap.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/rmap.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/rmap.h linux-3.0.4/include/linux/rmap.h
+--- linux-3.0.4/include/linux/rmap.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/rmap.h	2011-08-23 21:47:56.000000000 -0400
 @@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
  void anon_vma_init(void);	/* create anon_vma_cachep */
  int  anon_vma_prepare(struct vm_area_struct *);
@@ -54041,9 +56765,9 @@ diff -urNp linux-3.0.3/include/linux/rmap.h linux-3.0.3/include/linux/rmap.h
  void __anon_vma_link(struct vm_area_struct *);
  
  static inline void anon_vma_merge(struct vm_area_struct *vma,
-diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
---- linux-3.0.3/include/linux/sched.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sched.h	2011-08-25 17:22:27.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
+--- linux-3.0.4/include/linux/sched.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sched.h	2011-08-25 17:22:27.000000000 -0400
 @@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
@@ -54285,9 +57009,9 @@ diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-3.0.3/include/linux/screen_info.h linux-3.0.3/include/linux/screen_info.h
---- linux-3.0.3/include/linux/screen_info.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/screen_info.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/screen_info.h linux-3.0.4/include/linux/screen_info.h
+--- linux-3.0.4/include/linux/screen_info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/screen_info.h	2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -54298,9 +57022,9 @@ diff -urNp linux-3.0.3/include/linux/screen_info.h linux-3.0.3/include/linux/scr
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-3.0.3/include/linux/security.h linux-3.0.3/include/linux/security.h
---- linux-3.0.3/include/linux/security.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/security.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/security.h linux-3.0.4/include/linux/security.h
+--- linux-3.0.4/include/linux/security.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/security.h	2011-08-23 21:48:14.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -54309,9 +57033,9 @@ diff -urNp linux-3.0.3/include/linux/security.h linux-3.0.3/include/linux/securi
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-3.0.3/include/linux/seq_file.h linux-3.0.3/include/linux/seq_file.h
---- linux-3.0.3/include/linux/seq_file.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/seq_file.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/seq_file.h linux-3.0.4/include/linux/seq_file.h
+--- linux-3.0.4/include/linux/seq_file.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/seq_file.h	2011-08-23 21:47:56.000000000 -0400
 @@ -32,6 +32,7 @@ struct seq_operations {
  	void * (*next) (struct seq_file *m, void *v, loff_t *pos);
  	int (*show) (struct seq_file *m, void *v);
@@ -54320,9 +57044,9 @@ diff -urNp linux-3.0.3/include/linux/seq_file.h linux-3.0.3/include/linux/seq_fi
  
  #define SEQ_SKIP 1
  
-diff -urNp linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3/include/linux/shmem_fs.h
---- linux-3.0.3/include/linux/shmem_fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/shmem_fs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/shmem_fs.h linux-3.0.4/include/linux/shmem_fs.h
+--- linux-3.0.4/include/linux/shmem_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/shmem_fs.h	2011-08-23 21:47:56.000000000 -0400
 @@ -10,7 +10,7 @@
  
  #define SHMEM_NR_DIRECT 16
@@ -54332,9 +57056,9 @@ diff -urNp linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3/include/linux/shmem_
  
  struct shmem_inode_info {
  	spinlock_t		lock;
-diff -urNp linux-3.0.3/include/linux/shm.h linux-3.0.3/include/linux/shm.h
---- linux-3.0.3/include/linux/shm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/shm.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/shm.h linux-3.0.4/include/linux/shm.h
+--- linux-3.0.4/include/linux/shm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/shm.h	2011-08-23 21:48:14.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
@@ -54346,9 +57070,9 @@ diff -urNp linux-3.0.3/include/linux/shm.h linux-3.0.3/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-3.0.3/include/linux/skbuff.h linux-3.0.3/include/linux/skbuff.h
---- linux-3.0.3/include/linux/skbuff.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/skbuff.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
+--- linux-3.0.4/include/linux/skbuff.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/skbuff.h	2011-08-23 21:47:56.000000000 -0400
 @@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -54385,9 +57109,9 @@ diff -urNp linux-3.0.3/include/linux/skbuff.h linux-3.0.3/include/linux/skbuff.h
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-3.0.3/include/linux/slab_def.h linux-3.0.3/include/linux/slab_def.h
---- linux-3.0.3/include/linux/slab_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/slab_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/slab_def.h linux-3.0.4/include/linux/slab_def.h
+--- linux-3.0.4/include/linux/slab_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/slab_def.h	2011-08-23 21:47:56.000000000 -0400
 @@ -96,10 +96,10 @@ struct kmem_cache {
  	unsigned long node_allocs;
  	unsigned long node_frees;
@@ -54403,9 +57127,9 @@ diff -urNp linux-3.0.3/include/linux/slab_def.h linux-3.0.3/include/linux/slab_d
  
  	/*
  	 * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-3.0.3/include/linux/slab.h linux-3.0.3/include/linux/slab.h
---- linux-3.0.3/include/linux/slab.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/slab.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
+--- linux-3.0.4/include/linux/slab.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/slab.h	2011-08-23 21:47:56.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -54512,9 +57236,9 @@ diff -urNp linux-3.0.3/include/linux/slab.h linux-3.0.3/include/linux/slab.h
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-3.0.3/include/linux/slub_def.h linux-3.0.3/include/linux/slub_def.h
---- linux-3.0.3/include/linux/slub_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/slub_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_def.h
+--- linux-3.0.4/include/linux/slub_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/slub_def.h	2011-08-23 21:47:56.000000000 -0400
 @@ -82,7 +82,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
@@ -54533,9 +57257,9 @@ diff -urNp linux-3.0.3/include/linux/slub_def.h linux-3.0.3/include/linux/slub_d
  
  static __always_inline void *
  kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-diff -urNp linux-3.0.3/include/linux/sonet.h linux-3.0.3/include/linux/sonet.h
---- linux-3.0.3/include/linux/sonet.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sonet.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sonet.h linux-3.0.4/include/linux/sonet.h
+--- linux-3.0.4/include/linux/sonet.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sonet.h	2011-08-23 21:47:56.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -54545,9 +57269,9 @@ diff -urNp linux-3.0.3/include/linux/sonet.h linux-3.0.3/include/linux/sonet.h
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3/include/linux/sunrpc/clnt.h
---- linux-3.0.3/include/linux/sunrpc/clnt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sunrpc/clnt.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4/include/linux/sunrpc/clnt.h
+--- linux-3.0.4/include/linux/sunrpc/clnt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sunrpc/clnt.h	2011-08-23 21:47:56.000000000 -0400
 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
@@ -54578,9 +57302,9 @@ diff -urNp linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3/include/linux/sun
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-3.0.3/include/linux/sunrpc/svc_rdma.h linux-3.0.3/include/linux/sunrpc/svc_rdma.h
---- linux-3.0.3/include/linux/sunrpc/svc_rdma.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sunrpc/svc_rdma.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sunrpc/svc_rdma.h linux-3.0.4/include/linux/sunrpc/svc_rdma.h
+--- linux-3.0.4/include/linux/sunrpc/svc_rdma.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sunrpc/svc_rdma.h	2011-08-23 21:47:56.000000000 -0400
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -54606,9 +57330,9 @@ diff -urNp linux-3.0.3/include/linux/sunrpc/svc_rdma.h linux-3.0.3/include/linux
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-3.0.3/include/linux/sysctl.h linux-3.0.3/include/linux/sysctl.h
---- linux-3.0.3/include/linux/sysctl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sysctl.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sysctl.h linux-3.0.4/include/linux/sysctl.h
+--- linux-3.0.4/include/linux/sysctl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sysctl.h	2011-08-23 21:48:14.000000000 -0400
 @@ -155,7 +155,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -54631,9 +57355,9 @@ diff -urNp linux-3.0.3/include/linux/sysctl.h linux-3.0.3/include/linux/sysctl.h
  extern int proc_dointvec(struct ctl_table *, int,
  			 void __user *, size_t *, loff_t *);
  extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff -urNp linux-3.0.3/include/linux/tty_ldisc.h linux-3.0.3/include/linux/tty_ldisc.h
---- linux-3.0.3/include/linux/tty_ldisc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/tty_ldisc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/tty_ldisc.h linux-3.0.4/include/linux/tty_ldisc.h
+--- linux-3.0.4/include/linux/tty_ldisc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/tty_ldisc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -54643,9 +57367,9 @@ diff -urNp linux-3.0.3/include/linux/tty_ldisc.h linux-3.0.3/include/linux/tty_l
  };
  
  struct tty_ldisc {
-diff -urNp linux-3.0.3/include/linux/types.h linux-3.0.3/include/linux/types.h
---- linux-3.0.3/include/linux/types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/types.h linux-3.0.4/include/linux/types.h
+--- linux-3.0.4/include/linux/types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/types.h	2011-08-23 21:47:56.000000000 -0400
 @@ -213,10 +213,26 @@ typedef struct {
  	int counter;
  } atomic_t;
@@ -54673,9 +57397,9 @@ diff -urNp linux-3.0.3/include/linux/types.h linux-3.0.3/include/linux/types.h
  #endif
  
  struct list_head {
-diff -urNp linux-3.0.3/include/linux/uaccess.h linux-3.0.3/include/linux/uaccess.h
---- linux-3.0.3/include/linux/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/uaccess.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/uaccess.h linux-3.0.4/include/linux/uaccess.h
+--- linux-3.0.4/include/linux/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/uaccess.h	2011-08-23 21:47:56.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -54690,9 +57414,9 @@ diff -urNp linux-3.0.3/include/linux/uaccess.h linux-3.0.3/include/linux/uaccess
  		ret;					\
  	})
  
-diff -urNp linux-3.0.3/include/linux/unaligned/access_ok.h linux-3.0.3/include/linux/unaligned/access_ok.h
---- linux-3.0.3/include/linux/unaligned/access_ok.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/unaligned/access_ok.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/unaligned/access_ok.h linux-3.0.4/include/linux/unaligned/access_ok.h
+--- linux-3.0.4/include/linux/unaligned/access_ok.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/unaligned/access_ok.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -54732,9 +57456,9 @@ diff -urNp linux-3.0.3/include/linux/unaligned/access_ok.h linux-3.0.3/include/l
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-3.0.3/include/linux/vmalloc.h linux-3.0.3/include/linux/vmalloc.h
---- linux-3.0.3/include/linux/vmalloc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/vmalloc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/vmalloc.h linux-3.0.4/include/linux/vmalloc.h
+--- linux-3.0.4/include/linux/vmalloc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/vmalloc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_MAP		0x00000004	/* vmap()ed pages */
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
@@ -54851,9 +57575,9 @@ diff -urNp linux-3.0.3/include/linux/vmalloc.h linux-3.0.3/include/linux/vmalloc
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-3.0.3/include/linux/vmstat.h linux-3.0.3/include/linux/vmstat.h
---- linux-3.0.3/include/linux/vmstat.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/vmstat.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/vmstat.h linux-3.0.4/include/linux/vmstat.h
+--- linux-3.0.4/include/linux/vmstat.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/vmstat.h	2011-08-23 21:47:56.000000000 -0400
 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -54917,9 +57641,9 @@ diff -urNp linux-3.0.3/include/linux/vmstat.h linux-3.0.3/include/linux/vmstat.h
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-3.0.3/include/media/saa7146_vv.h linux-3.0.3/include/media/saa7146_vv.h
---- linux-3.0.3/include/media/saa7146_vv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/media/saa7146_vv.h	2011-08-24 18:26:09.000000000 -0400
+diff -urNp linux-3.0.4/include/media/saa7146_vv.h linux-3.0.4/include/media/saa7146_vv.h
+--- linux-3.0.4/include/media/saa7146_vv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/media/saa7146_vv.h	2011-08-24 18:26:09.000000000 -0400
 @@ -163,7 +163,7 @@ struct saa7146_ext_vv
  	int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
  
@@ -54929,9 +57653,9 @@ diff -urNp linux-3.0.3/include/media/saa7146_vv.h linux-3.0.3/include/media/saa7
  	/* pointer to the saa7146 core ops */
  	const struct v4l2_ioctl_ops *core_ops;
  
-diff -urNp linux-3.0.3/include/media/v4l2-ioctl.h linux-3.0.3/include/media/v4l2-ioctl.h
---- linux-3.0.3/include/media/v4l2-ioctl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/media/v4l2-ioctl.h	2011-08-24 18:25:45.000000000 -0400
+diff -urNp linux-3.0.4/include/media/v4l2-ioctl.h linux-3.0.4/include/media/v4l2-ioctl.h
+--- linux-3.0.4/include/media/v4l2-ioctl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/media/v4l2-ioctl.h	2011-08-24 18:25:45.000000000 -0400
 @@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
  	long (*vidioc_default)	       (struct file *file, void *fh,
  					bool valid_prio, int cmd, void *arg);
@@ -54940,9 +57664,9 @@ diff -urNp linux-3.0.3/include/media/v4l2-ioctl.h linux-3.0.3/include/media/v4l2
  
  
  /* v4l debugging and diagnostics */
-diff -urNp linux-3.0.3/include/net/caif/cfctrl.h linux-3.0.3/include/net/caif/cfctrl.h
---- linux-3.0.3/include/net/caif/cfctrl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/caif/cfctrl.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/caif/cfctrl.h linux-3.0.4/include/net/caif/cfctrl.h
+--- linux-3.0.4/include/net/caif/cfctrl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/caif/cfctrl.h	2011-08-23 21:47:56.000000000 -0400
 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
  	void (*radioset_rsp)(void);
  	void (*reject_rsp)(struct cflayer *layer, u8 linkid,
@@ -54963,9 +57687,9 @@ diff -urNp linux-3.0.3/include/net/caif/cfctrl.h linux-3.0.3/include/net/caif/cf
  	struct list_head list;
  	/* Protects from simultaneous access to first_req list */
  	spinlock_t info_list_lock;
-diff -urNp linux-3.0.3/include/net/flow.h linux-3.0.3/include/net/flow.h
---- linux-3.0.3/include/net/flow.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/flow.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/flow.h linux-3.0.4/include/net/flow.h
+--- linux-3.0.4/include/net/flow.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/flow.h	2011-08-23 21:47:56.000000000 -0400
 @@ -188,6 +188,6 @@ extern struct flow_cache_object *flow_ca
  		u8 dir, flow_resolve_t resolver, void *ctx);
  
@@ -54974,9 +57698,9 @@ diff -urNp linux-3.0.3/include/net/flow.h linux-3.0.3/include/net/flow.h
 +extern atomic_unchecked_t flow_cache_genid;
  
  #endif
-diff -urNp linux-3.0.3/include/net/inetpeer.h linux-3.0.3/include/net/inetpeer.h
---- linux-3.0.3/include/net/inetpeer.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/inetpeer.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/inetpeer.h linux-3.0.4/include/net/inetpeer.h
+--- linux-3.0.4/include/net/inetpeer.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/inetpeer.h	2011-08-23 21:47:56.000000000 -0400
 @@ -43,8 +43,8 @@ struct inet_peer {
  	 */
  	union {
@@ -54997,9 +57721,9 @@ diff -urNp linux-3.0.3/include/net/inetpeer.h linux-3.0.3/include/net/inetpeer.h
  }
  
  #endif /* _NET_INETPEER_H */
-diff -urNp linux-3.0.3/include/net/ip_fib.h linux-3.0.3/include/net/ip_fib.h
---- linux-3.0.3/include/net/ip_fib.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/ip_fib.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/ip_fib.h linux-3.0.4/include/net/ip_fib.h
+--- linux-3.0.4/include/net/ip_fib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/ip_fib.h	2011-08-23 21:47:56.000000000 -0400
 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
  
  #define FIB_RES_SADDR(net, res)				\
@@ -55009,9 +57733,9 @@ diff -urNp linux-3.0.3/include/net/ip_fib.h linux-3.0.3/include/net/ip_fib.h
  	 FIB_RES_NH(res).nh_saddr :			\
  	 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
  #define FIB_RES_GW(res)			(FIB_RES_NH(res).nh_gw)
-diff -urNp linux-3.0.3/include/net/ip_vs.h linux-3.0.3/include/net/ip_vs.h
---- linux-3.0.3/include/net/ip_vs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/ip_vs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/ip_vs.h linux-3.0.4/include/net/ip_vs.h
+--- linux-3.0.4/include/net/ip_vs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/ip_vs.h	2011-08-23 21:47:56.000000000 -0400
 @@ -509,7 +509,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
@@ -55030,9 +57754,9 @@ diff -urNp linux-3.0.3/include/net/ip_vs.h linux-3.0.3/include/net/ip_vs.h
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff -urNp linux-3.0.3/include/net/irda/ircomm_core.h linux-3.0.3/include/net/irda/ircomm_core.h
---- linux-3.0.3/include/net/irda/ircomm_core.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/irda/ircomm_core.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/irda/ircomm_core.h linux-3.0.4/include/net/irda/ircomm_core.h
+--- linux-3.0.4/include/net/irda/ircomm_core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/irda/ircomm_core.h	2011-08-23 21:47:56.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct {
  	int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
  	int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
@@ -55042,9 +57766,9 @@ diff -urNp linux-3.0.3/include/net/irda/ircomm_core.h linux-3.0.3/include/net/ir
  
  struct ircomm_cb {
  	irda_queue_t queue;
-diff -urNp linux-3.0.3/include/net/irda/ircomm_tty.h linux-3.0.3/include/net/irda/ircomm_tty.h
---- linux-3.0.3/include/net/irda/ircomm_tty.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/irda/ircomm_tty.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/irda/ircomm_tty.h linux-3.0.4/include/net/irda/ircomm_tty.h
+--- linux-3.0.4/include/net/irda/ircomm_tty.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/irda/ircomm_tty.h	2011-08-23 21:47:56.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -55064,9 +57788,9 @@ diff -urNp linux-3.0.3/include/net/irda/ircomm_tty.h linux-3.0.3/include/net/ird
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-3.0.3/include/net/iucv/af_iucv.h linux-3.0.3/include/net/iucv/af_iucv.h
---- linux-3.0.3/include/net/iucv/af_iucv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/iucv/af_iucv.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/iucv/af_iucv.h linux-3.0.4/include/net/iucv/af_iucv.h
+--- linux-3.0.4/include/net/iucv/af_iucv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/iucv/af_iucv.h	2011-08-23 21:47:56.000000000 -0400
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
  	struct hlist_head head;
@@ -55076,9 +57800,9 @@ diff -urNp linux-3.0.3/include/net/iucv/af_iucv.h linux-3.0.3/include/net/iucv/a
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-3.0.3/include/net/lapb.h linux-3.0.3/include/net/lapb.h
---- linux-3.0.3/include/net/lapb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/lapb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
+--- linux-3.0.4/include/net/lapb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/lapb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -95,7 +95,7 @@ struct lapb_cb {
  	struct sk_buff_head	write_queue;
  	struct sk_buff_head	ack_queue;
@@ -55088,9 +57812,9 @@ diff -urNp linux-3.0.3/include/net/lapb.h linux-3.0.3/include/net/lapb.h
  
  	/* FRMR control information */
  	struct lapb_frame	frmr_data;
-diff -urNp linux-3.0.3/include/net/neighbour.h linux-3.0.3/include/net/neighbour.h
---- linux-3.0.3/include/net/neighbour.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/neighbour.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/neighbour.h
+--- linux-3.0.4/include/net/neighbour.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/neighbour.h	2011-08-26 19:49:56.000000000 -0400
 @@ -117,14 +117,14 @@ struct neighbour {
  };
  
@@ -55108,9 +57832,9 @@ diff -urNp linux-3.0.3/include/net/neighbour.h linux-3.0.3/include/net/neighbour
  
  struct pneigh_entry {
  	struct pneigh_entry	*next;
-diff -urNp linux-3.0.3/include/net/netlink.h linux-3.0.3/include/net/netlink.h
---- linux-3.0.3/include/net/netlink.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/netlink.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/netlink.h linux-3.0.4/include/net/netlink.h
+--- linux-3.0.4/include/net/netlink.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/netlink.h	2011-08-23 21:47:56.000000000 -0400
 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
@@ -55120,9 +57844,9 @@ diff -urNp linux-3.0.3/include/net/netlink.h linux-3.0.3/include/net/netlink.h
  }
  
  /**
-diff -urNp linux-3.0.3/include/net/netns/ipv4.h linux-3.0.3/include/net/netns/ipv4.h
---- linux-3.0.3/include/net/netns/ipv4.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/netns/ipv4.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/netns/ipv4.h linux-3.0.4/include/net/netns/ipv4.h
+--- linux-3.0.4/include/net/netns/ipv4.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/netns/ipv4.h	2011-08-23 21:47:56.000000000 -0400
 @@ -56,8 +56,8 @@ struct netns_ipv4 {
  
  	unsigned int sysctl_ping_group_range[2];
@@ -55134,9 +57858,9 @@ diff -urNp linux-3.0.3/include/net/netns/ipv4.h linux-3.0.3/include/net/netns/ip
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-3.0.3/include/net/sctp/sctp.h linux-3.0.3/include/net/sctp/sctp.h
---- linux-3.0.3/include/net/sctp/sctp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/sctp/sctp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/sctp/sctp.h linux-3.0.4/include/net/sctp/sctp.h
+--- linux-3.0.4/include/net/sctp/sctp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/sctp/sctp.h	2011-08-23 21:47:56.000000000 -0400
 @@ -315,9 +315,9 @@ do {									\
  
  #else	/* SCTP_DEBUG */
@@ -55150,9 +57874,9 @@ diff -urNp linux-3.0.3/include/net/sctp/sctp.h linux-3.0.3/include/net/sctp/sctp
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-3.0.3/include/net/sock.h linux-3.0.3/include/net/sock.h
---- linux-3.0.3/include/net/sock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/sock.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
+--- linux-3.0.4/include/net/sock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/sock.h	2011-08-23 21:47:56.000000000 -0400
 @@ -277,7 +277,7 @@ struct sock {
  #ifdef CONFIG_RPS
  	__u32			sk_rxhash;
@@ -55171,9 +57895,9 @@ diff -urNp linux-3.0.3/include/net/sock.h linux-3.0.3/include/net/sock.h
  					   int copy, int offset)
  {
  	if (skb->ip_summed == CHECKSUM_NONE) {
-diff -urNp linux-3.0.3/include/net/tcp.h linux-3.0.3/include/net/tcp.h
---- linux-3.0.3/include/net/tcp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/tcp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/tcp.h linux-3.0.4/include/net/tcp.h
+--- linux-3.0.4/include/net/tcp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/tcp.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1374,8 +1374,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
@@ -55185,9 +57909,9 @@ diff -urNp linux-3.0.3/include/net/tcp.h linux-3.0.3/include/net/tcp.h
  };
  
  struct tcp_iter_state {
-diff -urNp linux-3.0.3/include/net/udp.h linux-3.0.3/include/net/udp.h
---- linux-3.0.3/include/net/udp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/udp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/udp.h linux-3.0.4/include/net/udp.h
+--- linux-3.0.4/include/net/udp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/udp.h	2011-08-23 21:47:56.000000000 -0400
 @@ -234,8 +234,8 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
@@ -55199,9 +57923,9 @@ diff -urNp linux-3.0.3/include/net/udp.h linux-3.0.3/include/net/udp.h
  };
  
  struct udp_iter_state {
-diff -urNp linux-3.0.3/include/net/xfrm.h linux-3.0.3/include/net/xfrm.h
---- linux-3.0.3/include/net/xfrm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/xfrm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/xfrm.h linux-3.0.4/include/net/xfrm.h
+--- linux-3.0.4/include/net/xfrm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/xfrm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -505,7 +505,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
@@ -55211,9 +57935,9 @@ diff -urNp linux-3.0.3/include/net/xfrm.h linux-3.0.3/include/net/xfrm.h
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
-diff -urNp linux-3.0.3/include/rdma/iw_cm.h linux-3.0.3/include/rdma/iw_cm.h
---- linux-3.0.3/include/rdma/iw_cm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/rdma/iw_cm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/rdma/iw_cm.h linux-3.0.4/include/rdma/iw_cm.h
+--- linux-3.0.4/include/rdma/iw_cm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/rdma/iw_cm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -120,7 +120,7 @@ struct iw_cm_verbs {
  					 int backlog);
  
@@ -55223,9 +57947,9 @@ diff -urNp linux-3.0.3/include/rdma/iw_cm.h linux-3.0.3/include/rdma/iw_cm.h
  
  /**
   * iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-3.0.3/include/scsi/libfc.h linux-3.0.3/include/scsi/libfc.h
---- linux-3.0.3/include/scsi/libfc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/scsi/libfc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
+--- linux-3.0.4/include/scsi/libfc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/scsi/libfc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -750,6 +750,7 @@ struct libfc_function_template {
  	 */
  	void (*disc_stop_final) (struct fc_lport *);
@@ -55243,9 +57967,9 @@ diff -urNp linux-3.0.3/include/scsi/libfc.h linux-3.0.3/include/scsi/libfc.h
  	u8			       link_up;
  	u8			       qfull;
  	enum fc_lport_state	       state;
-diff -urNp linux-3.0.3/include/scsi/scsi_device.h linux-3.0.3/include/scsi/scsi_device.h
---- linux-3.0.3/include/scsi/scsi_device.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/scsi/scsi_device.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/scsi/scsi_device.h linux-3.0.4/include/scsi/scsi_device.h
+--- linux-3.0.4/include/scsi/scsi_device.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/scsi/scsi_device.h	2011-08-23 21:47:56.000000000 -0400
 @@ -161,9 +161,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
@@ -55259,9 +57983,9 @@ diff -urNp linux-3.0.3/include/scsi/scsi_device.h linux-3.0.3/include/scsi/scsi_
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff -urNp linux-3.0.3/include/scsi/scsi_transport_fc.h linux-3.0.3/include/scsi/scsi_transport_fc.h
---- linux-3.0.3/include/scsi/scsi_transport_fc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/scsi/scsi_transport_fc.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/scsi/scsi_transport_fc.h linux-3.0.4/include/scsi/scsi_transport_fc.h
+--- linux-3.0.4/include/scsi/scsi_transport_fc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/scsi/scsi_transport_fc.h	2011-08-26 19:49:56.000000000 -0400
 @@ -711,7 +711,7 @@ struct fc_function_template {
  	unsigned long	show_host_system_hostname:1;
  
@@ -55271,9 +57995,9 @@ diff -urNp linux-3.0.3/include/scsi/scsi_transport_fc.h linux-3.0.3/include/scsi
  
  
  /**
-diff -urNp linux-3.0.3/include/sound/ak4xxx-adda.h linux-3.0.3/include/sound/ak4xxx-adda.h
---- linux-3.0.3/include/sound/ak4xxx-adda.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/ak4xxx-adda.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/ak4xxx-adda.h linux-3.0.4/include/sound/ak4xxx-adda.h
+--- linux-3.0.4/include/sound/ak4xxx-adda.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/ak4xxx-adda.h	2011-08-23 21:47:56.000000000 -0400
 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
  	void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
  		      unsigned char val);
@@ -55283,9 +58007,9 @@ diff -urNp linux-3.0.3/include/sound/ak4xxx-adda.h linux-3.0.3/include/sound/ak4
  
  #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
  
-diff -urNp linux-3.0.3/include/sound/hwdep.h linux-3.0.3/include/sound/hwdep.h
---- linux-3.0.3/include/sound/hwdep.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/hwdep.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/hwdep.h linux-3.0.4/include/sound/hwdep.h
+--- linux-3.0.4/include/sound/hwdep.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/hwdep.h	2011-08-23 21:47:56.000000000 -0400
 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
  			  struct snd_hwdep_dsp_status *status);
  	int (*dsp_load)(struct snd_hwdep *hw,
@@ -55295,9 +58019,9 @@ diff -urNp linux-3.0.3/include/sound/hwdep.h linux-3.0.3/include/sound/hwdep.h
  
  struct snd_hwdep {
  	struct snd_card *card;
-diff -urNp linux-3.0.3/include/sound/info.h linux-3.0.3/include/sound/info.h
---- linux-3.0.3/include/sound/info.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/info.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/info.h linux-3.0.4/include/sound/info.h
+--- linux-3.0.4/include/sound/info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/info.h	2011-08-23 21:47:56.000000000 -0400
 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
  		     struct snd_info_buffer *buffer);
  	void (*write)(struct snd_info_entry *entry,
@@ -55307,9 +58031,9 @@ diff -urNp linux-3.0.3/include/sound/info.h linux-3.0.3/include/sound/info.h
  
  struct snd_info_entry_ops {
  	int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-3.0.3/include/sound/pcm.h linux-3.0.3/include/sound/pcm.h
---- linux-3.0.3/include/sound/pcm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/pcm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/pcm.h linux-3.0.4/include/sound/pcm.h
+--- linux-3.0.4/include/sound/pcm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/pcm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -81,6 +81,7 @@ struct snd_pcm_ops {
  	int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
  	int (*ack)(struct snd_pcm_substream *substream);
@@ -55318,9 +58042,9 @@ diff -urNp linux-3.0.3/include/sound/pcm.h linux-3.0.3/include/sound/pcm.h
  
  /*
   *
-diff -urNp linux-3.0.3/include/sound/sb16_csp.h linux-3.0.3/include/sound/sb16_csp.h
---- linux-3.0.3/include/sound/sb16_csp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/sb16_csp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/sb16_csp.h linux-3.0.4/include/sound/sb16_csp.h
+--- linux-3.0.4/include/sound/sb16_csp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/sb16_csp.h	2011-08-23 21:47:56.000000000 -0400
 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
  	int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
  	int (*csp_stop) (struct snd_sb_csp * p);
@@ -55330,9 +58054,9 @@ diff -urNp linux-3.0.3/include/sound/sb16_csp.h linux-3.0.3/include/sound/sb16_c
  
  /*
   * CSP private data
-diff -urNp linux-3.0.3/include/sound/soc.h linux-3.0.3/include/sound/soc.h
---- linux-3.0.3/include/sound/soc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/soc.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/soc.h linux-3.0.4/include/sound/soc.h
+--- linux-3.0.4/include/sound/soc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/soc.h	2011-08-26 19:49:56.000000000 -0400
 @@ -636,7 +636,7 @@ struct snd_soc_platform_driver {
  
  	/* platform stream ops */
@@ -55342,9 +58066,9 @@ diff -urNp linux-3.0.3/include/sound/soc.h linux-3.0.3/include/sound/soc.h
  
  struct snd_soc_platform {
  	const char *name;
-diff -urNp linux-3.0.3/include/sound/ymfpci.h linux-3.0.3/include/sound/ymfpci.h
---- linux-3.0.3/include/sound/ymfpci.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/ymfpci.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/ymfpci.h linux-3.0.4/include/sound/ymfpci.h
+--- linux-3.0.4/include/sound/ymfpci.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/ymfpci.h	2011-08-23 21:47:56.000000000 -0400
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
  	spinlock_t reg_lock;
  	spinlock_t voice_lock;
@@ -55354,9 +58078,9 @@ diff -urNp linux-3.0.3/include/sound/ymfpci.h linux-3.0.3/include/sound/ymfpci.h
  	struct snd_info_entry *proc_entry;
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
-diff -urNp linux-3.0.3/include/target/target_core_base.h linux-3.0.3/include/target/target_core_base.h
---- linux-3.0.3/include/target/target_core_base.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/target/target_core_base.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/target/target_core_base.h
+--- linux-3.0.4/include/target/target_core_base.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/target/target_core_base.h	2011-08-23 21:47:56.000000000 -0400
 @@ -364,7 +364,7 @@ struct t10_reservation_ops {
  	int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
  	int (*t10_pr_register)(struct se_cmd *);
@@ -55386,9 +58110,9 @@ diff -urNp linux-3.0.3/include/target/target_core_base.h linux-3.0.3/include/tar
  	atomic_t		dev_tur_active;
  	atomic_t		execute_tasks;
  	atomic_t		dev_status_thr_count;
-diff -urNp linux-3.0.3/include/trace/events/irq.h linux-3.0.3/include/trace/events/irq.h
---- linux-3.0.3/include/trace/events/irq.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/trace/events/irq.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/trace/events/irq.h linux-3.0.4/include/trace/events/irq.h
+--- linux-3.0.4/include/trace/events/irq.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/trace/events/irq.h	2011-08-23 21:47:56.000000000 -0400
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -55407,9 +58131,9 @@ diff -urNp linux-3.0.3/include/trace/events/irq.h linux-3.0.3/include/trace/even
  
  	TP_ARGS(irq, action, ret),
  
-diff -urNp linux-3.0.3/include/video/udlfb.h linux-3.0.3/include/video/udlfb.h
---- linux-3.0.3/include/video/udlfb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/video/udlfb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/video/udlfb.h linux-3.0.4/include/video/udlfb.h
+--- linux-3.0.4/include/video/udlfb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/video/udlfb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -51,10 +51,10 @@ struct dlfb_data {
  	int base8;
  	u32 pseudo_palette[256];
@@ -55425,9 +58149,9 @@ diff -urNp linux-3.0.3/include/video/udlfb.h linux-3.0.3/include/video/udlfb.h
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-3.0.3/include/video/uvesafb.h linux-3.0.3/include/video/uvesafb.h
---- linux-3.0.3/include/video/uvesafb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/video/uvesafb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/video/uvesafb.h linux-3.0.4/include/video/uvesafb.h
+--- linux-3.0.4/include/video/uvesafb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/video/uvesafb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -55436,9 +58160,9 @@ diff -urNp linux-3.0.3/include/video/uvesafb.h linux-3.0.3/include/video/uvesafb
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-3.0.3/init/do_mounts.c linux-3.0.3/init/do_mounts.c
---- linux-3.0.3/init/do_mounts.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts.c linux-3.0.4/init/do_mounts.c
+--- linux-3.0.4/init/do_mounts.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts.c	2011-08-23 21:47:56.000000000 -0400
 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -55478,9 +58202,9 @@ diff -urNp linux-3.0.3/init/do_mounts.c linux-3.0.3/init/do_mounts.c
 +	sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
  	sys_chroot((const char __user __force *)".");
  }
-diff -urNp linux-3.0.3/init/do_mounts.h linux-3.0.3/init/do_mounts.h
---- linux-3.0.3/init/do_mounts.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts.h linux-3.0.4/init/do_mounts.h
+--- linux-3.0.4/init/do_mounts.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts.h	2011-08-23 21:47:56.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -55500,9 +58224,9 @@ diff -urNp linux-3.0.3/init/do_mounts.h linux-3.0.3/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-3.0.3/init/do_mounts_initrd.c linux-3.0.3/init/do_mounts_initrd.c
---- linux-3.0.3/init/do_mounts_initrd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts_initrd.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd.c
+--- linux-3.0.4/init/do_mounts_initrd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts_initrd.c	2011-08-23 21:47:56.000000000 -0400
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
@@ -55577,9 +58301,9 @@ diff -urNp linux-3.0.3/init/do_mounts_initrd.c linux-3.0.3/init/do_mounts_initrd
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-3.0.3/init/do_mounts_md.c linux-3.0.3/init/do_mounts_md.c
---- linux-3.0.3/init/do_mounts_md.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts_md.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts_md.c linux-3.0.4/init/do_mounts_md.c
+--- linux-3.0.4/init/do_mounts_md.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts_md.c	2011-08-23 21:47:56.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -55598,9 +58322,9 @@ diff -urNp linux-3.0.3/init/do_mounts_md.c linux-3.0.3/init/do_mounts_md.c
  			sys_ioctl(fd, BLKRRPART, 0);
  		}
  		sys_close(fd);
-diff -urNp linux-3.0.3/init/initramfs.c linux-3.0.3/init/initramfs.c
---- linux-3.0.3/init/initramfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/initramfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
+--- linux-3.0.4/init/initramfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/initramfs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -55709,9 +58433,9 @@ diff -urNp linux-3.0.3/init/initramfs.c linux-3.0.3/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-3.0.3/init/Kconfig linux-3.0.3/init/Kconfig
---- linux-3.0.3/init/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/Kconfig	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/Kconfig linux-3.0.4/init/Kconfig
+--- linux-3.0.4/init/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/Kconfig	2011-08-23 21:47:56.000000000 -0400
 @@ -1195,7 +1195,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
@@ -55721,9 +58445,9 @@ diff -urNp linux-3.0.3/init/Kconfig linux-3.0.3/init/Kconfig
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-3.0.3/init/main.c linux-3.0.3/init/main.c
---- linux-3.0.3/init/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
+--- linux-3.0.4/init/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/main.c	2011-08-23 21:48:14.000000000 -0400
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -55835,9 +58559,9 @@ diff -urNp linux-3.0.3/init/main.c linux-3.0.3/init/main.c
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff -urNp linux-3.0.3/ipc/mqueue.c linux-3.0.3/ipc/mqueue.c
---- linux-3.0.3/ipc/mqueue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/ipc/mqueue.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/ipc/mqueue.c linux-3.0.4/ipc/mqueue.c
+--- linux-3.0.4/ipc/mqueue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/ipc/mqueue.c	2011-08-23 21:48:14.000000000 -0400
 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -55846,9 +58570,9 @@ diff -urNp linux-3.0.3/ipc/mqueue.c linux-3.0.3/ipc/mqueue.c
  			spin_lock(&mq_lock);
  			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		 	    u->mq_bytes + mq_bytes >
-diff -urNp linux-3.0.3/ipc/msg.c linux-3.0.3/ipc/msg.c
---- linux-3.0.3/ipc/msg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/ipc/msg.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
+--- linux-3.0.4/ipc/msg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/ipc/msg.c	2011-08-23 21:47:56.000000000 -0400
 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke
  	return security_msg_queue_associate(msq, msgflg);
  }
@@ -55874,9 +58598,9 @@ diff -urNp linux-3.0.3/ipc/msg.c linux-3.0.3/ipc/msg.c
  	msg_params.key = key;
  	msg_params.flg = msgflg;
  
-diff -urNp linux-3.0.3/ipc/sem.c linux-3.0.3/ipc/sem.c
---- linux-3.0.3/ipc/sem.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/ipc/sem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
+--- linux-3.0.4/ipc/sem.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/ipc/sem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
  	return 0;
  }
@@ -55923,9 +58647,9 @@ diff -urNp linux-3.0.3/ipc/sem.c linux-3.0.3/ipc/sem.c
  	ns = current->nsproxy->ipc_ns;
  
  	if (nsops < 1 || semid < 0)
-diff -urNp linux-3.0.3/ipc/shm.c linux-3.0.3/ipc/shm.c
---- linux-3.0.3/ipc/shm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/ipc/shm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
+--- linux-3.0.4/ipc/shm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/ipc/shm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -56012,9 +58736,9 @@ diff -urNp linux-3.0.3/ipc/shm.c linux-3.0.3/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-3.0.3/kernel/acct.c linux-3.0.3/kernel/acct.c
---- linux-3.0.3/kernel/acct.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/acct.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/acct.c linux-3.0.4/kernel/acct.c
+--- linux-3.0.4/kernel/acct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/acct.c	2011-08-23 21:47:56.000000000 -0400
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -56024,9 +58748,9 @@ diff -urNp linux-3.0.3/kernel/acct.c linux-3.0.3/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-3.0.3/kernel/audit.c linux-3.0.3/kernel/audit.c
---- linux-3.0.3/kernel/audit.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/audit.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
+--- linux-3.0.4/kernel/audit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/audit.c	2011-08-23 21:47:56.000000000 -0400
 @@ -112,7 +112,7 @@ u32		audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
@@ -56063,9 +58787,9 @@ diff -urNp linux-3.0.3/kernel/audit.c linux-3.0.3/kernel/audit.c
  		status_set.backlog	 = skb_queue_len(&audit_skb_queue);
  		audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
  				 &status_set, sizeof(status_set));
-diff -urNp linux-3.0.3/kernel/auditsc.c linux-3.0.3/kernel/auditsc.c
---- linux-3.0.3/kernel/auditsc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/auditsc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/auditsc.c linux-3.0.4/kernel/auditsc.c
+--- linux-3.0.4/kernel/auditsc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/auditsc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -56084,9 +58808,9 @@ diff -urNp linux-3.0.3/kernel/auditsc.c linux-3.0.3/kernel/auditsc.c
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff -urNp linux-3.0.3/kernel/capability.c linux-3.0.3/kernel/capability.c
---- linux-3.0.3/kernel/capability.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/capability.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/capability.c linux-3.0.4/kernel/capability.c
+--- linux-3.0.4/kernel/capability.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/capability.c	2011-08-23 21:48:14.000000000 -0400
 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
  		 * before modification is attempted and the application
  		 * fails.
@@ -56147,9 +58871,9 @@ diff -urNp linux-3.0.3/kernel/capability.c linux-3.0.3/kernel/capability.c
  /**
   * nsown_capable - Check superior capability to one's own user_ns
   * @cap: The capability in question
-diff -urNp linux-3.0.3/kernel/cgroup.c linux-3.0.3/kernel/cgroup.c
---- linux-3.0.3/kernel/cgroup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/cgroup.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/cgroup.c linux-3.0.4/kernel/cgroup.c
+--- linux-3.0.4/kernel/cgroup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/cgroup.c	2011-08-23 21:48:14.000000000 -0400
 @@ -593,6 +593,8 @@ static struct css_set *find_css_set(
  	struct hlist_head *hhead;
  	struct cg_cgroup_link *link;
@@ -56159,9 +58883,9 @@ diff -urNp linux-3.0.3/kernel/cgroup.c linux-3.0.3/kernel/cgroup.c
  	/* First see if we already have a cgroup group that matches
  	 * the desired set */
  	read_lock(&css_set_lock);
-diff -urNp linux-3.0.3/kernel/compat.c linux-3.0.3/kernel/compat.c
---- linux-3.0.3/kernel/compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/compat.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/compat.c linux-3.0.4/kernel/compat.c
+--- linux-3.0.4/kernel/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/compat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -56170,9 +58894,9 @@ diff -urNp linux-3.0.3/kernel/compat.c linux-3.0.3/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff -urNp linux-3.0.3/kernel/configs.c linux-3.0.3/kernel/configs.c
---- linux-3.0.3/kernel/configs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/configs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/configs.c linux-3.0.4/kernel/configs.c
+--- linux-3.0.4/kernel/configs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/configs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -56193,9 +58917,9 @@ diff -urNp linux-3.0.3/kernel/configs.c linux-3.0.3/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
---- linux-3.0.3/kernel/cred.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/cred.c	2011-08-25 17:23:03.000000000 -0400
+diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
+--- linux-3.0.4/kernel/cred.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/cred.c	2011-08-25 17:23:03.000000000 -0400
 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -56344,9 +59068,9 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
  	ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-3.0.3/kernel/debug/debug_core.c linux-3.0.3/kernel/debug/debug_core.c
---- linux-3.0.3/kernel/debug/debug_core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/debug/debug_core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/debug/debug_core.c linux-3.0.4/kernel/debug/debug_core.c
+--- linux-3.0.4/kernel/debug/debug_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/debug/debug_core.c	2011-08-23 21:47:56.000000000 -0400
 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
   */
  static atomic_t			masters_in_kgdb;
@@ -56407,9 +59131,9 @@ diff -urNp linux-3.0.3/kernel/debug/debug_core.c linux-3.0.3/kernel/debug/debug_
  	tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-diff -urNp linux-3.0.3/kernel/debug/kdb/kdb_main.c linux-3.0.3/kernel/debug/kdb/kdb_main.c
---- linux-3.0.3/kernel/debug/kdb/kdb_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/debug/kdb/kdb_main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/debug/kdb/kdb_main.c linux-3.0.4/kernel/debug/kdb/kdb_main.c
+--- linux-3.0.4/kernel/debug/kdb/kdb_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/debug/kdb/kdb_main.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
  	list_for_each_entry(mod, kdb_modules, list) {
  
@@ -56428,9 +59152,9 @@ diff -urNp linux-3.0.3/kernel/debug/kdb/kdb_main.c linux-3.0.3/kernel/debug/kdb/
  
  #ifdef CONFIG_MODULE_UNLOAD
  		{
-diff -urNp linux-3.0.3/kernel/events/core.c linux-3.0.3/kernel/events/core.c
---- linux-3.0.3/kernel/events/core.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/kernel/events/core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
+--- linux-3.0.4/kernel/events/core.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/kernel/events/core.c	2011-08-23 21:47:56.000000000 -0400
 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
  	return 0;
  }
@@ -56511,9 +59235,9 @@ diff -urNp linux-3.0.3/kernel/events/core.c linux-3.0.3/kernel/events/core.c
  		     &parent_event->child_total_time_running);
  
  	/*
-diff -urNp linux-3.0.3/kernel/exit.c linux-3.0.3/kernel/exit.c
---- linux-3.0.3/kernel/exit.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/exit.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
+--- linux-3.0.4/kernel/exit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/exit.c	2011-08-23 21:48:14.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -56627,9 +59351,9 @@ diff -urNp linux-3.0.3/kernel/exit.c linux-3.0.3/kernel/exit.c
  	exit_mm(tsk);
  
  	if (group_dead)
-diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
---- linux-3.0.3/kernel/fork.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/fork.c	2011-08-25 17:23:36.000000000 -0400
+diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
+--- linux-3.0.4/kernel/fork.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/fork.c	2011-08-25 17:23:36.000000000 -0400
 @@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
@@ -56927,9 +59651,9 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-3.0.3/kernel/futex.c linux-3.0.3/kernel/futex.c
---- linux-3.0.3/kernel/futex.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/kernel/futex.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/futex.c linux-3.0.4/kernel/futex.c
+--- linux-3.0.4/kernel/futex.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/kernel/futex.c	2011-08-23 21:48:14.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -57017,9 +59741,9 @@ diff -urNp linux-3.0.3/kernel/futex.c linux-3.0.3/kernel/futex.c
  
  	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
  		plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
-diff -urNp linux-3.0.3/kernel/futex_compat.c linux-3.0.3/kernel/futex_compat.c
---- linux-3.0.3/kernel/futex_compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/futex_compat.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/futex_compat.c linux-3.0.4/kernel/futex_compat.c
+--- linux-3.0.4/kernel/futex_compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/futex_compat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -57059,9 +59783,9 @@ diff -urNp linux-3.0.3/kernel/futex_compat.c linux-3.0.3/kernel/futex_compat.c
  		head = p->compat_robust_list;
  		rcu_read_unlock();
  	}
-diff -urNp linux-3.0.3/kernel/gcov/base.c linux-3.0.3/kernel/gcov/base.c
---- linux-3.0.3/kernel/gcov/base.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/gcov/base.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/gcov/base.c linux-3.0.4/kernel/gcov/base.c
+--- linux-3.0.4/kernel/gcov/base.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/gcov/base.c	2011-08-23 21:47:56.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -57083,9 +59807,9 @@ diff -urNp linux-3.0.3/kernel/gcov/base.c linux-3.0.3/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-3.0.3/kernel/hrtimer.c linux-3.0.3/kernel/hrtimer.c
---- linux-3.0.3/kernel/hrtimer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/hrtimer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/hrtimer.c linux-3.0.4/kernel/hrtimer.c
+--- linux-3.0.4/kernel/hrtimer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/hrtimer.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
@@ -57095,9 +59819,9 @@ diff -urNp linux-3.0.3/kernel/hrtimer.c linux-3.0.3/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-3.0.3/kernel/jump_label.c linux-3.0.3/kernel/jump_label.c
---- linux-3.0.3/kernel/jump_label.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/jump_label.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/jump_label.c linux-3.0.4/kernel/jump_label.c
+--- linux-3.0.4/kernel/jump_label.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/jump_label.c	2011-08-23 21:47:56.000000000 -0400
 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
  
  	size = (((unsigned long)stop - (unsigned long)start)
@@ -57121,9 +59845,9 @@ diff -urNp linux-3.0.3/kernel/jump_label.c linux-3.0.3/kernel/jump_label.c
  }
  
  static int
-diff -urNp linux-3.0.3/kernel/kallsyms.c linux-3.0.3/kernel/kallsyms.c
---- linux-3.0.3/kernel/kallsyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/kallsyms.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/kallsyms.c linux-3.0.4/kernel/kallsyms.c
+--- linux-3.0.4/kernel/kallsyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/kallsyms.c	2011-08-23 21:48:14.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -57226,9 +59950,9 @@ diff -urNp linux-3.0.3/kernel/kallsyms.c linux-3.0.3/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-3.0.3/kernel/kmod.c linux-3.0.3/kernel/kmod.c
---- linux-3.0.3/kernel/kmod.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/kmod.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/kernel/kmod.c
+--- linux-3.0.4/kernel/kmod.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/kmod.c	2011-08-23 21:48:14.000000000 -0400
 @@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -57325,9 +60049,9 @@ diff -urNp linux-3.0.3/kernel/kmod.c linux-3.0.3/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-3.0.3/kernel/kprobes.c linux-3.0.3/kernel/kprobes.c
---- linux-3.0.3/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/kprobes.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
+--- linux-3.0.4/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/kprobes.c	2011-08-23 21:47:56.000000000 -0400
 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
  	 * kernel image and loaded module images reside. This is required
  	 * so x86_64 can correctly handle the %rip-relative fixups.
@@ -57364,9 +60088,9 @@ diff -urNp linux-3.0.3/kernel/kprobes.c linux-3.0.3/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-3.0.3/kernel/lockdep.c linux-3.0.3/kernel/lockdep.c
---- linux-3.0.3/kernel/lockdep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/lockdep.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
+--- linux-3.0.4/kernel/lockdep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/lockdep.c	2011-08-23 21:47:56.000000000 -0400
 @@ -583,6 +583,10 @@ static int static_obj(void *obj)
  		      end   = (unsigned long) &_end,
  		      addr  = (unsigned long) obj;
@@ -57395,9 +60119,9 @@ diff -urNp linux-3.0.3/kernel/lockdep.c linux-3.0.3/kernel/lockdep.c
  	if (very_verbose(class)) {
  		printk("\nacquire class [%p] %s", class->key, class->name);
  		if (class->name_version > 1)
-diff -urNp linux-3.0.3/kernel/lockdep_proc.c linux-3.0.3/kernel/lockdep_proc.c
---- linux-3.0.3/kernel/lockdep_proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/lockdep_proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/lockdep_proc.c linux-3.0.4/kernel/lockdep_proc.c
+--- linux-3.0.4/kernel/lockdep_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/lockdep_proc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -57407,9 +60131,9 @@ diff -urNp linux-3.0.3/kernel/lockdep_proc.c linux-3.0.3/kernel/lockdep_proc.c
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-3.0.3/kernel/module.c linux-3.0.3/kernel/module.c
---- linux-3.0.3/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/module.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
+--- linux-3.0.4/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/module.c	2011-08-23 21:48:14.000000000 -0400
 @@ -58,6 +58,7 @@
  #include <linux/jump_label.h>
  #include <linux/pfn.h>
@@ -58138,9 +60862,9 @@ diff -urNp linux-3.0.3/kernel/module.c linux-3.0.3/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-3.0.3/kernel/mutex.c linux-3.0.3/kernel/mutex.c
---- linux-3.0.3/kernel/mutex.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/mutex.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/mutex.c linux-3.0.4/kernel/mutex.c
+--- linux-3.0.4/kernel/mutex.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/mutex.c	2011-08-23 21:47:56.000000000 -0400
 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, 
  	spin_lock_mutex(&lock->wait_lock, flags);
  
@@ -58169,9 +60893,9 @@ diff -urNp linux-3.0.3/kernel/mutex.c linux-3.0.3/kernel/mutex.c
  	mutex_set_owner(lock);
  
  	/* set it to 0 if there are no waiters left: */
-diff -urNp linux-3.0.3/kernel/mutex-debug.c linux-3.0.3/kernel/mutex-debug.c
---- linux-3.0.3/kernel/mutex-debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/mutex-debug.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/mutex-debug.c linux-3.0.4/kernel/mutex-debug.c
+--- linux-3.0.4/kernel/mutex-debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/mutex-debug.c	2011-08-23 21:47:56.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -58200,9 +60924,9 @@ diff -urNp linux-3.0.3/kernel/mutex-debug.c linux-3.0.3/kernel/mutex-debug.c
  
  	list_del_init(&waiter->list);
  	waiter->task = NULL;
-diff -urNp linux-3.0.3/kernel/mutex-debug.h linux-3.0.3/kernel/mutex-debug.h
---- linux-3.0.3/kernel/mutex-debug.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/mutex-debug.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/mutex-debug.h linux-3.0.4/kernel/mutex-debug.h
+--- linux-3.0.4/kernel/mutex-debug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/mutex-debug.h	2011-08-23 21:47:56.000000000 -0400
 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -58215,9 +60939,9 @@ diff -urNp linux-3.0.3/kernel/mutex-debug.h linux-3.0.3/kernel/mutex-debug.h
  extern void debug_mutex_unlock(struct mutex *lock);
  extern void debug_mutex_init(struct mutex *lock, const char *name,
  			     struct lock_class_key *key);
-diff -urNp linux-3.0.3/kernel/padata.c linux-3.0.3/kernel/padata.c
---- linux-3.0.3/kernel/padata.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/padata.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/padata.c linux-3.0.4/kernel/padata.c
+--- linux-3.0.4/kernel/padata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/padata.c	2011-08-23 21:47:56.000000000 -0400
 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
  	padata->pd = pd;
  	padata->cb_cpu = cb_cpu;
@@ -58241,9 +60965,9 @@ diff -urNp linux-3.0.3/kernel/padata.c linux-3.0.3/kernel/padata.c
  	atomic_set(&pd->reorder_objects, 0);
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
-diff -urNp linux-3.0.3/kernel/panic.c linux-3.0.3/kernel/panic.c
---- linux-3.0.3/kernel/panic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/panic.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
+--- linux-3.0.4/kernel/panic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/panic.c	2011-08-23 21:48:14.000000000 -0400
 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
@@ -58263,9 +60987,9 @@ diff -urNp linux-3.0.3/kernel/panic.c linux-3.0.3/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-3.0.3/kernel/pid.c linux-3.0.3/kernel/pid.c
---- linux-3.0.3/kernel/pid.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/pid.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
+--- linux-3.0.4/kernel/pid.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/pid.c	2011-08-23 21:48:14.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -58313,9 +61037,9 @@ diff -urNp linux-3.0.3/kernel/pid.c linux-3.0.3/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
  	struct pid *pid;
-diff -urNp linux-3.0.3/kernel/posix-cpu-timers.c linux-3.0.3/kernel/posix-cpu-timers.c
---- linux-3.0.3/kernel/posix-cpu-timers.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/posix-cpu-timers.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-timers.c
+--- linux-3.0.4/kernel/posix-cpu-timers.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/posix-cpu-timers.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -58341,9 +61065,9 @@ diff -urNp linux-3.0.3/kernel/posix-cpu-timers.c linux-3.0.3/kernel/posix-cpu-ti
  		.clock_getres	= thread_cpu_clock_getres,
  		.clock_get	= thread_cpu_clock_get,
  		.timer_create	= thread_cpu_timer_create,
-diff -urNp linux-3.0.3/kernel/posix-timers.c linux-3.0.3/kernel/posix-timers.c
---- linux-3.0.3/kernel/posix-timers.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/posix-timers.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/posix-timers.c linux-3.0.4/kernel/posix-timers.c
+--- linux-3.0.4/kernel/posix-timers.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/posix-timers.c	2011-08-23 21:48:14.000000000 -0400
 @@ -43,6 +43,7 @@
  #include <linux/idr.h>
  #include <linux/posix-clock.h>
@@ -58447,9 +61171,9 @@ diff -urNp linux-3.0.3/kernel/posix-timers.c linux-3.0.3/kernel/posix-timers.c
  	return kc->clock_set(which_clock, &new_tp);
  }
  
-diff -urNp linux-3.0.3/kernel/power/poweroff.c linux-3.0.3/kernel/power/poweroff.c
---- linux-3.0.3/kernel/power/poweroff.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/power/poweroff.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/power/poweroff.c linux-3.0.4/kernel/power/poweroff.c
+--- linux-3.0.4/kernel/power/poweroff.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/power/poweroff.c	2011-08-23 21:47:56.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
@@ -58459,9 +61183,9 @@ diff -urNp linux-3.0.3/kernel/power/poweroff.c linux-3.0.3/kernel/power/poweroff
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-3.0.3/kernel/power/process.c linux-3.0.3/kernel/power/process.c
---- linux-3.0.3/kernel/power/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/power/process.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/power/process.c linux-3.0.4/kernel/power/process.c
+--- linux-3.0.4/kernel/power/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/power/process.c	2011-08-23 21:47:56.000000000 -0400
 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
  	u64 elapsed_csecs64;
  	unsigned int elapsed_csecs;
@@ -58504,9 +61228,9 @@ diff -urNp linux-3.0.3/kernel/power/process.c linux-3.0.3/kernel/power/process.c
  			break;
  
  		if (pm_wakeup_pending()) {
-diff -urNp linux-3.0.3/kernel/printk.c linux-3.0.3/kernel/printk.c
---- linux-3.0.3/kernel/printk.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/printk.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/printk.c linux-3.0.4/kernel/printk.c
+--- linux-3.0.4/kernel/printk.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/printk.c	2011-08-23 21:48:14.000000000 -0400
 @@ -313,12 +313,17 @@ static int check_syslog_permissions(int 
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
@@ -58526,9 +61250,9 @@ diff -urNp linux-3.0.3/kernel/printk.c linux-3.0.3/kernel/printk.c
  				 "but no CAP_SYSLOG (deprecated).\n");
  			return 0;
  		}
-diff -urNp linux-3.0.3/kernel/profile.c linux-3.0.3/kernel/profile.c
---- linux-3.0.3/kernel/profile.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/profile.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/profile.c linux-3.0.4/kernel/profile.c
+--- linux-3.0.4/kernel/profile.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/profile.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -58586,9 +61310,9 @@ diff -urNp linux-3.0.3/kernel/profile.c linux-3.0.3/kernel/profile.c
  	return count;
  }
  
-diff -urNp linux-3.0.3/kernel/ptrace.c linux-3.0.3/kernel/ptrace.c
---- linux-3.0.3/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/ptrace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
+--- linux-3.0.4/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/ptrace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
@@ -58760,9 +61484,9 @@ diff -urNp linux-3.0.3/kernel/ptrace.c linux-3.0.3/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-3.0.3/kernel/rcutorture.c linux-3.0.3/kernel/rcutorture.c
---- linux-3.0.3/kernel/rcutorture.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rcutorture.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
+--- linux-3.0.4/kernel/rcutorture.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rcutorture.c	2011-08-23 21:47:56.000000000 -0400
 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
  	{ 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -58923,9 +61647,9 @@ diff -urNp linux-3.0.3/kernel/rcutorture.c linux-3.0.3/kernel/rcutorture.c
  	for_each_possible_cpu(cpu) {
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-3.0.3/kernel/rcutree.c linux-3.0.3/kernel/rcutree.c
---- linux-3.0.3/kernel/rcutree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rcutree.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rcutree.c linux-3.0.4/kernel/rcutree.c
+--- linux-3.0.4/kernel/rcutree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rcutree.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1470,7 +1470,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
@@ -58935,9 +61659,9 @@ diff -urNp linux-3.0.3/kernel/rcutree.c linux-3.0.3/kernel/rcutree.c
  {
  	__rcu_process_callbacks(&rcu_sched_state,
  				&__get_cpu_var(rcu_sched_data));
-diff -urNp linux-3.0.3/kernel/rcutree_plugin.h linux-3.0.3/kernel/rcutree_plugin.h
---- linux-3.0.3/kernel/rcutree_plugin.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rcutree_plugin.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rcutree_plugin.h linux-3.0.4/kernel/rcutree_plugin.h
+--- linux-3.0.4/kernel/rcutree_plugin.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rcutree_plugin.h	2011-08-23 21:47:56.000000000 -0400
 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
@@ -59000,9 +61724,9 @@ diff -urNp linux-3.0.3/kernel/rcutree_plugin.h linux-3.0.3/kernel/rcutree_plugin
  
  	put_online_cpus();
  }
-diff -urNp linux-3.0.3/kernel/relay.c linux-3.0.3/kernel/relay.c
---- linux-3.0.3/kernel/relay.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/relay.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/relay.c linux-3.0.4/kernel/relay.c
+--- linux-3.0.4/kernel/relay.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/relay.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
  	};
  	ssize_t ret;
@@ -59012,9 +61736,9 @@ diff -urNp linux-3.0.3/kernel/relay.c linux-3.0.3/kernel/relay.c
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
  	if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-3.0.3/kernel/resource.c linux-3.0.3/kernel/resource.c
---- linux-3.0.3/kernel/resource.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/resource.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/resource.c linux-3.0.4/kernel/resource.c
+--- linux-3.0.4/kernel/resource.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/resource.c	2011-08-23 21:48:14.000000000 -0400
 @@ -141,8 +141,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -59034,9 +61758,9 @@ diff -urNp linux-3.0.3/kernel/resource.c linux-3.0.3/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-3.0.3/kernel/rtmutex-tester.c linux-3.0.3/kernel/rtmutex-tester.c
---- linux-3.0.3/kernel/rtmutex-tester.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rtmutex-tester.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rtmutex-tester.c linux-3.0.4/kernel/rtmutex-tester.c
+--- linux-3.0.4/kernel/rtmutex-tester.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rtmutex-tester.c	2011-08-23 21:47:56.000000000 -0400
 @@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
@@ -59127,9 +61851,9 @@ diff -urNp linux-3.0.3/kernel/rtmutex-tester.c linux-3.0.3/kernel/rtmutex-tester
  		return;
  
  	default:
-diff -urNp linux-3.0.3/kernel/sched_autogroup.c linux-3.0.3/kernel/sched_autogroup.c
---- linux-3.0.3/kernel/sched_autogroup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sched_autogroup.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sched_autogroup.c linux-3.0.4/kernel/sched_autogroup.c
+--- linux-3.0.4/kernel/sched_autogroup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sched_autogroup.c	2011-08-23 21:47:56.000000000 -0400
 @@ -7,7 +7,7 @@
  
  unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -59148,9 +61872,9 @@ diff -urNp linux-3.0.3/kernel/sched_autogroup.c linux-3.0.3/kernel/sched_autogro
  	ag->tg = tg;
  #ifdef CONFIG_RT_GROUP_SCHED
  	/*
-diff -urNp linux-3.0.3/kernel/sched.c linux-3.0.3/kernel/sched.c
---- linux-3.0.3/kernel/sched.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sched.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
+--- linux-3.0.4/kernel/sched.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sched.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4251,6 +4251,8 @@ asmlinkage void __sched schedule(void)
  	struct rq *rq;
  	int cpu;
@@ -59187,9 +61911,9 @@ diff -urNp linux-3.0.3/kernel/sched.c linux-3.0.3/kernel/sched.c
  			/* can't set/change the rt policy */
  			if (policy != p->policy && !rlim_rtprio)
  				return -EPERM;
-diff -urNp linux-3.0.3/kernel/sched_fair.c linux-3.0.3/kernel/sched_fair.c
---- linux-3.0.3/kernel/sched_fair.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sched_fair.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sched_fair.c linux-3.0.4/kernel/sched_fair.c
+--- linux-3.0.4/kernel/sched_fair.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sched_fair.c	2011-08-23 21:47:56.000000000 -0400
 @@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
@@ -59199,9 +61923,9 @@ diff -urNp linux-3.0.3/kernel/sched_fair.c linux-3.0.3/kernel/sched_fair.c
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-3.0.3/kernel/signal.c linux-3.0.3/kernel/signal.c
---- linux-3.0.3/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
+--- linux-3.0.4/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -59334,9 +62058,9 @@ diff -urNp linux-3.0.3/kernel/signal.c linux-3.0.3/kernel/signal.c
  	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
  		error = check_kill_permission(sig, info, p);
  		/*
-diff -urNp linux-3.0.3/kernel/smp.c linux-3.0.3/kernel/smp.c
---- linux-3.0.3/kernel/smp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/smp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/smp.c linux-3.0.4/kernel/smp.c
+--- linux-3.0.4/kernel/smp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/smp.c	2011-08-23 21:47:56.000000000 -0400
 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -59364,9 +62088,9 @@ diff -urNp linux-3.0.3/kernel/smp.c linux-3.0.3/kernel/smp.c
  {
  	raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-3.0.3/kernel/softirq.c linux-3.0.3/kernel/softirq.c
---- linux-3.0.3/kernel/softirq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/softirq.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/softirq.c linux-3.0.4/kernel/softirq.c
+--- linux-3.0.4/kernel/softirq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/softirq.c	2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -59417,10 +62141,10 @@ diff -urNp linux-3.0.3/kernel/softirq.c linux-3.0.3/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
---- linux-3.0.3/kernel/sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sys.c	2011-08-25 17:24:58.000000000 -0400
-@@ -154,6 +154,12 @@ static int set_one_prio(struct task_stru
+diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
+--- linux-3.0.4/kernel/sys.c	2011-08-29 23:26:14.000000000 -0400
++++ linux-3.0.4/kernel/sys.c	2011-08-29 23:26:27.000000000 -0400
+@@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
  	}
@@ -59433,7 +62157,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	no_nice = security_task_setnice(p, niceval);
  	if (no_nice) {
  		error = no_nice;
-@@ -537,6 +543,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -541,6 +547,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
  			goto error;
  	}
  
@@ -59443,7 +62167,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (rgid != (gid_t) -1 ||
  	    (egid != (gid_t) -1 && egid != old->gid))
  		new->sgid = new->egid;
-@@ -566,6 +575,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -570,6 +579,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -59454,7 +62178,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (nsown_capable(CAP_SETGID))
  		new->gid = new->egid = new->sgid = new->fsgid = gid;
  	else if (gid == old->gid || gid == old->sgid)
-@@ -591,11 +604,18 @@ static int set_user(struct cred *new)
+@@ -595,11 +608,18 @@ static int set_user(struct cred *new)
  	if (!new_user)
  		return -EAGAIN;
  
@@ -59477,7 +62201,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  
  	free_uid(new->user);
  	new->user = new_user;
-@@ -646,6 +666,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -650,6 +670,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
  			goto error;
  	}
  
@@ -59487,7 +62211,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (new->uid != old->uid) {
  		retval = set_user(new);
  		if (retval < 0)
-@@ -690,6 +713,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -694,6 +717,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -59500,7 +62224,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (nsown_capable(CAP_SETUID)) {
  		new->suid = new->uid = uid;
  		if (uid != old->uid) {
-@@ -744,6 +773,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
+@@ -748,6 +777,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
  			goto error;
  	}
  
@@ -59510,7 +62234,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (ruid != (uid_t) -1) {
  		new->uid = ruid;
  		if (ruid != old->uid) {
-@@ -808,6 +840,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
+@@ -812,6 +844,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
  			goto error;
  	}
  
@@ -59520,7 +62244,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (rgid != (gid_t) -1)
  		new->gid = rgid;
  	if (egid != (gid_t) -1)
-@@ -854,6 +889,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -858,6 +893,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  	old = current_cred();
  	old_fsuid = old->fsuid;
  
@@ -59530,7 +62254,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	if (uid == old->uid  || uid == old->euid  ||
  	    uid == old->suid || uid == old->fsuid ||
  	    nsown_capable(CAP_SETUID)) {
-@@ -864,6 +902,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -868,6 +906,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  		}
  	}
  
@@ -59538,7 +62262,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	abort_creds(new);
  	return old_fsuid;
  
-@@ -890,12 +929,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -894,12 +933,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
  	if (gid == old->gid  || gid == old->egid  ||
  	    gid == old->sgid || gid == old->fsgid ||
  	    nsown_capable(CAP_SETGID)) {
@@ -59555,7 +62279,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  	abort_creds(new);
  	return old_fsgid;
  
-@@ -1642,7 +1685,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1680,7 +1723,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
  			error = get_dumpable(me->mm);
  			break;
  		case PR_SET_DUMPABLE:
@@ -59564,9 +62288,9 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-3.0.3/kernel/sysctl.c linux-3.0.3/kernel/sysctl.c
---- linux-3.0.3/kernel/sysctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sysctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
+--- linux-3.0.4/kernel/sysctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sysctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -85,6 +85,13 @@
  
  
@@ -59756,9 +62480,9 @@ diff -urNp linux-3.0.3/kernel/sysctl.c linux-3.0.3/kernel/sysctl.c
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-3.0.3/kernel/sysctl_check.c linux-3.0.3/kernel/sysctl_check.c
---- linux-3.0.3/kernel/sysctl_check.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sysctl_check.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sysctl_check.c linux-3.0.4/kernel/sysctl_check.c
+--- linux-3.0.4/kernel/sysctl_check.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sysctl_check.c	2011-08-23 21:48:14.000000000 -0400
 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
  				set_fail(&fail, table, "Directory with extra2");
  		} else {
@@ -59767,9 +62491,9 @@ diff -urNp linux-3.0.3/kernel/sysctl_check.c linux-3.0.3/kernel/sysctl_check.c
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-3.0.3/kernel/taskstats.c linux-3.0.3/kernel/taskstats.c
---- linux-3.0.3/kernel/taskstats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/taskstats.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/taskstats.c linux-3.0.4/kernel/taskstats.c
+--- linux-3.0.4/kernel/taskstats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/taskstats.c	2011-08-23 21:48:14.000000000 -0400
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -59793,9 +62517,9 @@ diff -urNp linux-3.0.3/kernel/taskstats.c linux-3.0.3/kernel/taskstats.c
  	if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
  		return cmd_attr_register_cpumask(info);
  	else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff -urNp linux-3.0.3/kernel/time/alarmtimer.c linux-3.0.3/kernel/time/alarmtimer.c
---- linux-3.0.3/kernel/time/alarmtimer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/alarmtimer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/alarmtimer.c linux-3.0.4/kernel/time/alarmtimer.c
+--- linux-3.0.4/kernel/time/alarmtimer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/alarmtimer.c	2011-08-23 21:47:56.000000000 -0400
 @@ -685,7 +685,7 @@ static int __init alarmtimer_init(void)
  {
  	int error = 0;
@@ -59805,9 +62529,9 @@ diff -urNp linux-3.0.3/kernel/time/alarmtimer.c linux-3.0.3/kernel/time/alarmtim
  		.clock_getres	= alarm_clock_getres,
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
-diff -urNp linux-3.0.3/kernel/time/tick-broadcast.c linux-3.0.3/kernel/time/tick-broadcast.c
---- linux-3.0.3/kernel/time/tick-broadcast.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/tick-broadcast.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/tick-broadcast.c linux-3.0.4/kernel/time/tick-broadcast.c
+--- linux-3.0.4/kernel/time/tick-broadcast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/tick-broadcast.c	2011-08-23 21:47:56.000000000 -0400
 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
@@ -59817,9 +62541,9 @@ diff -urNp linux-3.0.3/kernel/time/tick-broadcast.c linux-3.0.3/kernel/time/tick
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3/kernel/time/timekeeping.c
---- linux-3.0.3/kernel/time/timekeeping.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/timekeeping.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4/kernel/time/timekeeping.c
+--- linux-3.0.4/kernel/time/timekeeping.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/timekeeping.c	2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -59837,9 +62561,9 @@ diff -urNp linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3/kernel/time/timekee
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-3.0.3/kernel/time/timer_list.c linux-3.0.3/kernel/time/timer_list.c
---- linux-3.0.3/kernel/time/timer_list.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/timer_list.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/timer_list.c linux-3.0.4/kernel/time/timer_list.c
+--- linux-3.0.4/kernel/time/timer_list.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/timer_list.c	2011-08-23 21:48:14.000000000 -0400
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -59881,9 +62605,9 @@ diff -urNp linux-3.0.3/kernel/time/timer_list.c linux-3.0.3/kernel/time/timer_li
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-3.0.3/kernel/time/timer_stats.c linux-3.0.3/kernel/time/timer_stats.c
---- linux-3.0.3/kernel/time/timer_stats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/timer_stats.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/timer_stats.c linux-3.0.4/kernel/time/timer_stats.c
+--- linux-3.0.4/kernel/time/timer_stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/timer_stats.c	2011-08-23 21:48:14.000000000 -0400
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -59952,9 +62676,9 @@ diff -urNp linux-3.0.3/kernel/time/timer_stats.c linux-3.0.3/kernel/time/timer_s
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-3.0.3/kernel/time.c linux-3.0.3/kernel/time.c
---- linux-3.0.3/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time.c linux-3.0.4/kernel/time.c
+--- linux-3.0.4/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time.c	2011-08-23 21:48:14.000000000 -0400
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
  		return error;
  
@@ -59967,9 +62691,9 @@ diff -urNp linux-3.0.3/kernel/time.c linux-3.0.3/kernel/time.c
  		/* SMP safe, global irq locking makes it work. */
  		sys_tz = *tz;
  		update_vsyscall_tz();
-diff -urNp linux-3.0.3/kernel/timer.c linux-3.0.3/kernel/timer.c
---- linux-3.0.3/kernel/timer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/timer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/timer.c linux-3.0.4/kernel/timer.c
+--- linux-3.0.4/kernel/timer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/timer.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -59979,9 +62703,9 @@ diff -urNp linux-3.0.3/kernel/timer.c linux-3.0.3/kernel/timer.c
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-3.0.3/kernel/trace/blktrace.c linux-3.0.3/kernel/trace/blktrace.c
---- linux-3.0.3/kernel/trace/blktrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/blktrace.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace.c
+--- linux-3.0.4/kernel/trace/blktrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/blktrace.c	2011-08-23 21:47:56.000000000 -0400
 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
  	struct blk_trace *bt = filp->private_data;
  	char buf[16];
@@ -60009,9 +62733,9 @@ diff -urNp linux-3.0.3/kernel/trace/blktrace.c linux-3.0.3/kernel/trace/blktrace
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-3.0.3/kernel/trace/ftrace.c linux-3.0.3/kernel/trace/ftrace.c
---- linux-3.0.3/kernel/trace/ftrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/ftrace.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
+--- linux-3.0.4/kernel/trace/ftrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/ftrace.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, 
  	if (unlikely(ftrace_disabled))
  		return 0;
@@ -60041,9 +62765,9 @@ diff -urNp linux-3.0.3/kernel/trace/ftrace.c linux-3.0.3/kernel/trace/ftrace.c
  {
  	struct ftrace_func_probe *entry;
  	struct ftrace_page *pg;
-diff -urNp linux-3.0.3/kernel/trace/trace.c linux-3.0.3/kernel/trace/trace.c
---- linux-3.0.3/kernel/trace/trace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
+--- linux-3.0.4/kernel/trace/trace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe(
  	size_t rem;
  	unsigned int i;
@@ -60086,9 +62810,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace.c linux-3.0.3/kernel/trace/trace.c
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-3.0.3/kernel/trace/trace_events.c linux-3.0.3/kernel/trace/trace_events.c
---- linux-3.0.3/kernel/trace/trace_events.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_events.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trace_events.c
+--- linux-3.0.4/kernel/trace/trace_events.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_events.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
  	struct list_head		list;
@@ -60135,9 +62859,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_events.c linux-3.0.3/kernel/trace/trac
  	}
  }
  
-diff -urNp linux-3.0.3/kernel/trace/trace_mmiotrace.c linux-3.0.3/kernel/trace/trace_mmiotrace.c
---- linux-3.0.3/kernel/trace/trace_mmiotrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_mmiotrace.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_mmiotrace.c linux-3.0.4/kernel/trace/trace_mmiotrace.c
+--- linux-3.0.4/kernel/trace/trace_mmiotrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_mmiotrace.c	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -60174,9 +62898,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_mmiotrace.c linux-3.0.3/kernel/trace/t
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff -urNp linux-3.0.3/kernel/trace/trace_output.c linux-3.0.3/kernel/trace/trace_output.c
---- linux-3.0.3/kernel/trace/trace_output.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_output.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_output.c linux-3.0.4/kernel/trace/trace_output.c
+--- linux-3.0.4/kernel/trace/trace_output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_output.c	2011-08-23 21:47:56.000000000 -0400
 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -60186,9 +62910,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_output.c linux-3.0.3/kernel/trace/trac
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-3.0.3/kernel/trace/trace_stack.c linux-3.0.3/kernel/trace/trace_stack.c
---- linux-3.0.3/kernel/trace/trace_stack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_stack.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_stack.c linux-3.0.4/kernel/trace/trace_stack.c
+--- linux-3.0.4/kernel/trace/trace_stack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_stack.c	2011-08-23 21:47:56.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -60198,9 +62922,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_stack.c linux-3.0.3/kernel/trace/trace
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-3.0.3/kernel/trace/trace_workqueue.c linux-3.0.3/kernel/trace/trace_workqueue.c
---- linux-3.0.3/kernel/trace/trace_workqueue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_workqueue.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_workqueue.c linux-3.0.4/kernel/trace/trace_workqueue.c
+--- linux-3.0.4/kernel/trace/trace_workqueue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_workqueue.c	2011-08-23 21:47:56.000000000 -0400
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -60228,9 +62952,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_workqueue.c linux-3.0.3/kernel/trace/t
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-3.0.3/lib/bug.c linux-3.0.3/lib/bug.c
---- linux-3.0.3/lib/bug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/bug.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/bug.c linux-3.0.4/lib/bug.c
+--- linux-3.0.4/lib/bug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/bug.c	2011-08-23 21:47:56.000000000 -0400
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
@@ -60240,9 +62964,9 @@ diff -urNp linux-3.0.3/lib/bug.c linux-3.0.3/lib/bug.c
  
  	file = NULL;
  	line = 0;
-diff -urNp linux-3.0.3/lib/debugobjects.c linux-3.0.3/lib/debugobjects.c
---- linux-3.0.3/lib/debugobjects.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/debugobjects.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/debugobjects.c linux-3.0.4/lib/debugobjects.c
+--- linux-3.0.4/lib/debugobjects.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/debugobjects.c	2011-08-23 21:47:56.000000000 -0400
 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
@@ -60252,9 +62976,9 @@ diff -urNp linux-3.0.3/lib/debugobjects.c linux-3.0.3/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-3.0.3/lib/dma-debug.c linux-3.0.3/lib/dma-debug.c
---- linux-3.0.3/lib/dma-debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/dma-debug.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/dma-debug.c linux-3.0.4/lib/dma-debug.c
+--- linux-3.0.4/lib/dma-debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/dma-debug.c	2011-08-23 21:47:56.000000000 -0400
 @@ -870,7 +870,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -60264,9 +62988,9 @@ diff -urNp linux-3.0.3/lib/dma-debug.c linux-3.0.3/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-3.0.3/lib/extable.c linux-3.0.3/lib/extable.c
---- linux-3.0.3/lib/extable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/extable.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/extable.c linux-3.0.4/lib/extable.c
+--- linux-3.0.4/lib/extable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/extable.c	2011-08-23 21:47:56.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/init.h>
  #include <linux/sort.h>
@@ -60286,9 +63010,9 @@ diff -urNp linux-3.0.3/lib/extable.c linux-3.0.3/lib/extable.c
  }
  
  #ifdef CONFIG_MODULES
-diff -urNp linux-3.0.3/lib/inflate.c linux-3.0.3/lib/inflate.c
---- linux-3.0.3/lib/inflate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/inflate.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/inflate.c linux-3.0.4/lib/inflate.c
+--- linux-3.0.4/lib/inflate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/inflate.c	2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -60298,9 +63022,9 @@ diff -urNp linux-3.0.3/lib/inflate.c linux-3.0.3/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-3.0.3/lib/Kconfig.debug linux-3.0.3/lib/Kconfig.debug
---- linux-3.0.3/lib/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/Kconfig.debug	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/lib/Kconfig.debug linux-3.0.4/lib/Kconfig.debug
+--- linux-3.0.4/lib/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/Kconfig.debug	2011-08-23 21:48:14.000000000 -0400
 @@ -1088,6 +1088,7 @@ config LATENCYTOP
  	depends on DEBUG_KERNEL
  	depends on STACKTRACE_SUPPORT
@@ -60309,9 +63033,9 @@ diff -urNp linux-3.0.3/lib/Kconfig.debug linux-3.0.3/lib/Kconfig.debug
  	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
  	select KALLSYMS
  	select KALLSYMS_ALL
-diff -urNp linux-3.0.3/lib/kref.c linux-3.0.3/lib/kref.c
---- linux-3.0.3/lib/kref.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/kref.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/kref.c linux-3.0.4/lib/kref.c
+--- linux-3.0.4/lib/kref.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/kref.c	2011-08-23 21:47:56.000000000 -0400
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -60321,9 +63045,9 @@ diff -urNp linux-3.0.3/lib/kref.c linux-3.0.3/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-3.0.3/lib/radix-tree.c linux-3.0.3/lib/radix-tree.c
---- linux-3.0.3/lib/radix-tree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/radix-tree.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/radix-tree.c linux-3.0.4/lib/radix-tree.c
+--- linux-3.0.4/lib/radix-tree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/radix-tree.c	2011-08-23 21:47:56.000000000 -0400
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -60333,9 +63057,9 @@ diff -urNp linux-3.0.3/lib/radix-tree.c linux-3.0.3/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-3.0.3/lib/vsprintf.c linux-3.0.3/lib/vsprintf.c
---- linux-3.0.3/lib/vsprintf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/vsprintf.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
+--- linux-3.0.4/lib/vsprintf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/vsprintf.c	2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -60429,14 +63153,14 @@ diff -urNp linux-3.0.3/lib/vsprintf.c linux-3.0.3/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-3.0.3/localversion-grsec linux-3.0.3/localversion-grsec
---- linux-3.0.3/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/localversion-grsec	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/localversion-grsec linux-3.0.4/localversion-grsec
+--- linux-3.0.4/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/localversion-grsec	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
---- linux-3.0.3/Makefile	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/Makefile	2011-08-27 21:15:31.000000000 -0400
+diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
+--- linux-3.0.4/Makefile	2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/Makefile	2011-08-30 18:24:49.000000000 -0400
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -60462,7 +63186,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
  KBUILD_AFLAGS_KERNEL :=
  KBUILD_CFLAGS_KERNEL :=
  KBUILD_AFLAGS   := -D__ASSEMBLY__
-@@ -564,6 +567,25 @@ else
+@@ -564,6 +567,24 @@ else
  KBUILD_CFLAGS	+= -O2
  endif
  
@@ -60472,9 +63196,8 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
 +STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
 +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
-+gcc-plugins0:
++gcc-plugins: prepare
 +	$(Q)$(MAKE) $(build)=tools/gcc
-+gcc-plugins: scripts_basic gcc-plugins0
 +else
 +gcc-plugins:
 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
@@ -60488,7 +63211,7 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
  include $(srctree)/arch/$(SRCARCH)/Makefile
  
  ifneq ($(CONFIG_FRAME_WARN),0)
-@@ -708,7 +730,7 @@ export mod_strip_cmd
+@@ -708,7 +729,7 @@ export mod_strip_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -60497,31 +63220,61 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -907,6 +929,7 @@ define rule_vmlinux-modpost
+@@ -907,6 +928,8 @@ define rule_vmlinux-modpost
  endef
  
  # vmlinux image - including updated kernel symbols
-+vmlinux: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-all): KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++$(vmlinux-all): gcc-plugins
  vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
  ifdef CONFIG_HEADERS_CHECK
  	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
-@@ -973,7 +996,7 @@ ifneq ($(KBUILD_SRC),)
- endif
+@@ -932,7 +955,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
+ 
+ # The actual objects are generated when descending, 
+ # make sure no implicit rule kicks in
+-$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): prepare scripts $(vmlinux-dirs) ;
+ 
+ # Handle descending into subdirectories listed in $(vmlinux-dirs)
+ # Preset locale variables to speed up the build process. Limit locale
+@@ -941,7 +964,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
+ # Error messages still appears in the original language
  
- # prepare2 creates a makefile if using a separate output directory
--prepare2: prepare3 outputmakefile asm-generic
-+prepare2: prepare3 outputmakefile asm-generic gcc-plugins
+ PHONY += $(vmlinux-dirs)
+-$(vmlinux-dirs): prepare scripts
++$(vmlinux-dirs): gcc-plugins
+ 	$(Q)$(MAKE) $(build)=$@
  
- prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
-                    include/config/auto.conf
-@@ -1087,6 +1110,7 @@ all: modules
+ # Store (new) KERNELRELASE string in include/config/kernel.release
+@@ -1087,7 +1110,8 @@ all: modules
  #	using awk while concatenating to the final file.
  
  PHONY += modules
-+modules: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
+-modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
++$(vmlinux-dirs): KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++modules: prepare scripts $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
  	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
  	@$(kecho) '  Building modules, stage 2.';
+ 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
+@@ -1102,7 +1126,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
+ 
+ # Target to prepare building external modules
+ PHONY += modules_prepare
+-modules_prepare: prepare scripts
++modules_prepare: gcc-plugins prepare scripts
+ 
+ # Target to install modules
+ PHONY += modules_install
+@@ -1198,7 +1222,7 @@ distclean: mrproper
+ 	@find $(srctree) $(RCS_FIND_IGNORE) \
+ 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+ 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
+-		-o -name '.*.rej' -o -size 0 \
++		-o -name '.*.rej' -o -name '*.so' -o -size 0 \
+ 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+ 		-type f -print | xargs rm -f
+ 
 @@ -1359,6 +1383,7 @@ PHONY += $(module-dirs) modules
  $(module-dirs): crmodverdir $(objtree)/Module.symvers
  	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
@@ -60530,18 +63283,26 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
  modules: $(module-dirs)
  	@$(kecho) '  Building modules, stage 2.';
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1404,7 +1429,7 @@ clean: $(clean-dirs)
- 	$(call cmd,rmdirs)
- 	$(call cmd,rmfiles)
- 	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
--		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-+		\( -name '*.[oas]' -o -name '*.[ks]o' -o -name '.*.cmd' \
- 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
- 		-o -name '*.symtypes' -o -name 'modules.order' \
- 		-o -name modules.builtin -o -name '.tmp_*.o.*' \
-diff -urNp linux-3.0.3/mm/filemap.c linux-3.0.3/mm/filemap.c
---- linux-3.0.3/mm/filemap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/filemap.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1489,13 +1514,14 @@ endif
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.i: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.c prepare scripts FORCE
++%.o: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
++%.o: %.c gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.lst: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.s: %.S prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.S prepare scripts FORCE
++%.o: %.S gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.symtypes: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
+--- linux-3.0.4/mm/filemap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/filemap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
@@ -60559,9 +63320,9 @@ diff -urNp linux-3.0.3/mm/filemap.c linux-3.0.3/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-3.0.3/mm/fremap.c linux-3.0.3/mm/fremap.c
---- linux-3.0.3/mm/fremap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/fremap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/fremap.c linux-3.0.4/mm/fremap.c
+--- linux-3.0.4/mm/fremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/fremap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
@@ -60574,9 +63335,9 @@ diff -urNp linux-3.0.3/mm/fremap.c linux-3.0.3/mm/fremap.c
  	/*
  	 * Make sure the vma is shared, that it supports prefaulting,
  	 * and that the remapped range is valid and fully within
-diff -urNp linux-3.0.3/mm/highmem.c linux-3.0.3/mm/highmem.c
---- linux-3.0.3/mm/highmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/highmem.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/highmem.c linux-3.0.4/mm/highmem.c
+--- linux-3.0.4/mm/highmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/highmem.c	2011-08-23 21:47:56.000000000 -0400
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -60602,9 +63363,9 @@ diff -urNp linux-3.0.3/mm/highmem.c linux-3.0.3/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-3.0.3/mm/huge_memory.c linux-3.0.3/mm/huge_memory.c
---- linux-3.0.3/mm/huge_memory.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/huge_memory.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/huge_memory.c linux-3.0.4/mm/huge_memory.c
+--- linux-3.0.4/mm/huge_memory.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/huge_memory.c	2011-08-23 21:47:56.000000000 -0400
 @@ -702,7 +702,7 @@ out:
  	 * run pte_offset_map on the pmd, if an huge pmd could
  	 * materialize from under us from a different thread.
@@ -60614,9 +63375,9 @@ diff -urNp linux-3.0.3/mm/huge_memory.c linux-3.0.3/mm/huge_memory.c
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-diff -urNp linux-3.0.3/mm/hugetlb.c linux-3.0.3/mm/hugetlb.c
---- linux-3.0.3/mm/hugetlb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/hugetlb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
+--- linux-3.0.4/mm/hugetlb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/hugetlb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
@@ -60706,9 +63467,9 @@ diff -urNp linux-3.0.3/mm/hugetlb.c linux-3.0.3/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-3.0.3/mm/internal.h linux-3.0.3/mm/internal.h
---- linux-3.0.3/mm/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/internal.h linux-3.0.4/mm/internal.h
+--- linux-3.0.4/mm/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
   * in mm/page_alloc.c
   */
@@ -60717,9 +63478,9 @@ diff -urNp linux-3.0.3/mm/internal.h linux-3.0.3/mm/internal.h
  extern void prep_compound_page(struct page *page, unsigned long order);
  #ifdef CONFIG_MEMORY_FAILURE
  extern bool is_free_buddy_page(struct page *page);
-diff -urNp linux-3.0.3/mm/Kconfig linux-3.0.3/mm/Kconfig
---- linux-3.0.3/mm/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/Kconfig linux-3.0.4/mm/Kconfig
+--- linux-3.0.4/mm/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -240,7 +240,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -60729,9 +63490,9 @@ diff -urNp linux-3.0.3/mm/Kconfig linux-3.0.3/mm/Kconfig
          help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-3.0.3/mm/kmemleak.c linux-3.0.3/mm/kmemleak.c
---- linux-3.0.3/mm/kmemleak.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/kmemleak.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/kmemleak.c linux-3.0.4/mm/kmemleak.c
+--- linux-3.0.4/mm/kmemleak.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/kmemleak.c	2011-08-23 21:48:14.000000000 -0400
 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
@@ -60741,9 +63502,9 @@ diff -urNp linux-3.0.3/mm/kmemleak.c linux-3.0.3/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-3.0.3/mm/madvise.c linux-3.0.3/mm/madvise.c
---- linux-3.0.3/mm/madvise.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/madvise.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/madvise.c linux-3.0.4/mm/madvise.c
+--- linux-3.0.4/mm/madvise.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/madvise.c	2011-08-23 21:47:56.000000000 -0400
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
@@ -60820,9 +63581,9 @@ diff -urNp linux-3.0.3/mm/madvise.c linux-3.0.3/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-3.0.3/mm/memory.c linux-3.0.3/mm/memory.c
---- linux-3.0.3/mm/memory.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/mm/memory.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
+--- linux-3.0.4/mm/memory.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/mm/memory.c	2011-08-23 21:47:56.000000000 -0400
 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -61386,9 +64147,9 @@ diff -urNp linux-3.0.3/mm/memory.c linux-3.0.3/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-3.0.3/mm/memory-failure.c linux-3.0.3/mm/memory-failure.c
---- linux-3.0.3/mm/memory-failure.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/memory-failure.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
+--- linux-3.0.4/mm/memory-failure.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/memory-failure.c	2011-08-23 21:47:56.000000000 -0400
 @@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -61461,9 +64222,9 @@ diff -urNp linux-3.0.3/mm/memory-failure.c linux-3.0.3/mm/memory-failure.c
  	SetPageHWPoison(page);
  	/* keep elevated page count for bad page */
  	return ret;
-diff -urNp linux-3.0.3/mm/mempolicy.c linux-3.0.3/mm/mempolicy.c
---- linux-3.0.3/mm/mempolicy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mempolicy.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mempolicy.c linux-3.0.4/mm/mempolicy.c
+--- linux-3.0.4/mm/mempolicy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mempolicy.c	2011-08-23 21:48:14.000000000 -0400
 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct 
  	unsigned long vmstart;
  	unsigned long vmend;
@@ -61535,9 +64296,9 @@ diff -urNp linux-3.0.3/mm/mempolicy.c linux-3.0.3/mm/mempolicy.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-3.0.3/mm/migrate.c linux-3.0.3/mm/migrate.c
---- linux-3.0.3/mm/migrate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/migrate.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/migrate.c linux-3.0.4/mm/migrate.c
+--- linux-3.0.4/mm/migrate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/migrate.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
  	unsigned long chunk_start;
  	int err;
@@ -61572,9 +64333,9 @@ diff -urNp linux-3.0.3/mm/migrate.c linux-3.0.3/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-3.0.3/mm/mlock.c linux-3.0.3/mm/mlock.c
---- linux-3.0.3/mm/mlock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mlock.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mlock.c linux-3.0.4/mm/mlock.c
+--- linux-3.0.4/mm/mlock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mlock.c	2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -61648,9 +64409,9 @@ diff -urNp linux-3.0.3/mm/mlock.c linux-3.0.3/mm/mlock.c
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-3.0.3/mm/mmap.c linux-3.0.3/mm/mmap.c
---- linux-3.0.3/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mmap.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
+--- linux-3.0.4/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mmap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -62909,9 +65670,9 @@ diff -urNp linux-3.0.3/mm/mmap.c linux-3.0.3/mm/mmap.c
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-3.0.3/mm/mprotect.c linux-3.0.3/mm/mprotect.c
---- linux-3.0.3/mm/mprotect.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mprotect.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mprotect.c linux-3.0.4/mm/mprotect.c
+--- linux-3.0.4/mm/mprotect.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mprotect.c	2011-08-23 21:48:14.000000000 -0400
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -63138,9 +65899,9 @@ diff -urNp linux-3.0.3/mm/mprotect.c linux-3.0.3/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-3.0.3/mm/mremap.c linux-3.0.3/mm/mremap.c
---- linux-3.0.3/mm/mremap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mremap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/mremap.c linux-3.0.4/mm/mremap.c
+--- linux-3.0.4/mm/mremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mremap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -63245,9 +66006,9 @@ diff -urNp linux-3.0.3/mm/mremap.c linux-3.0.3/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-3.0.3/mm/nobootmem.c linux-3.0.3/mm/nobootmem.c
---- linux-3.0.3/mm/nobootmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/nobootmem.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/nobootmem.c linux-3.0.4/mm/nobootmem.c
+--- linux-3.0.4/mm/nobootmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/nobootmem.c	2011-08-23 21:47:56.000000000 -0400
 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
@@ -63281,9 +66042,9 @@ diff -urNp linux-3.0.3/mm/nobootmem.c linux-3.0.3/mm/nobootmem.c
  
  	return count;
  }
-diff -urNp linux-3.0.3/mm/nommu.c linux-3.0.3/mm/nommu.c
---- linux-3.0.3/mm/nommu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/nommu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
+--- linux-3.0.4/mm/nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/nommu.c	2011-08-23 21:47:56.000000000 -0400
 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -63316,9 +66077,9 @@ diff -urNp linux-3.0.3/mm/nommu.c linux-3.0.3/mm/nommu.c
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-diff -urNp linux-3.0.3/mm/page_alloc.c linux-3.0.3/mm/page_alloc.c
---- linux-3.0.3/mm/page_alloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/page_alloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
+--- linux-3.0.4/mm/page_alloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/page_alloc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -340,7 +340,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -63372,9 +66133,9 @@ diff -urNp linux-3.0.3/mm/page_alloc.c linux-3.0.3/mm/page_alloc.c
  	for_each_populated_zone(zone) {
  		if (skip_free_areas_node(filter, zone_to_nid(zone)))
  			continue;
-diff -urNp linux-3.0.3/mm/percpu.c linux-3.0.3/mm/percpu.c
---- linux-3.0.3/mm/percpu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/percpu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/percpu.c linux-3.0.4/mm/percpu.c
+--- linux-3.0.4/mm/percpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/percpu.c	2011-08-23 21:47:56.000000000 -0400
 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -63384,9 +66145,9 @@ diff -urNp linux-3.0.3/mm/percpu.c linux-3.0.3/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-3.0.3/mm/rmap.c linux-3.0.3/mm/rmap.c
---- linux-3.0.3/mm/rmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/rmap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
+--- linux-3.0.4/mm/rmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/rmap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru
  	struct anon_vma *anon_vma = vma->anon_vma;
  	struct anon_vma_chain *avc;
@@ -63476,9 +66237,9 @@ diff -urNp linux-3.0.3/mm/rmap.c linux-3.0.3/mm/rmap.c
  {
  	struct anon_vma_chain *avc;
  	struct anon_vma *anon_vma;
-diff -urNp linux-3.0.3/mm/shmem.c linux-3.0.3/mm/shmem.c
---- linux-3.0.3/mm/shmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/shmem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
+--- linux-3.0.4/mm/shmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/shmem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -63516,9 +66277,9 @@ diff -urNp linux-3.0.3/mm/shmem.c linux-3.0.3/mm/shmem.c
  	if (!sbinfo)
  		return -ENOMEM;
  
-diff -urNp linux-3.0.3/mm/slab.c linux-3.0.3/mm/slab.c
---- linux-3.0.3/mm/slab.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/slab.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
+--- linux-3.0.4/mm/slab.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/slab.c	2011-08-23 21:48:14.000000000 -0400
 @@ -151,7 +151,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -63690,9 +66451,9 @@ diff -urNp linux-3.0.3/mm/slab.c linux-3.0.3/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-3.0.3/mm/slob.c linux-3.0.3/mm/slob.c
---- linux-3.0.3/mm/slob.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/slob.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
+--- linux-3.0.4/mm/slob.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/slob.c	2011-08-23 21:47:56.000000000 -0400
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -64041,9 +66802,9 @@ diff -urNp linux-3.0.3/mm/slob.c linux-3.0.3/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-3.0.3/mm/slub.c linux-3.0.3/mm/slub.c
---- linux-3.0.3/mm/slub.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/slub.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
+--- linux-3.0.4/mm/slub.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/slub.c	2011-08-23 21:48:14.000000000 -0400
 @@ -442,7 +442,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
@@ -64218,9 +66979,9 @@ diff -urNp linux-3.0.3/mm/slub.c linux-3.0.3/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-3.0.3/mm/swap.c linux-3.0.3/mm/swap.c
---- linux-3.0.3/mm/swap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/swap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/swap.c linux-3.0.4/mm/swap.c
+--- linux-3.0.4/mm/swap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/swap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -31,6 +31,7 @@
  #include <linux/backing-dev.h>
  #include <linux/memcontrol.h>
@@ -64238,9 +66999,9 @@ diff -urNp linux-3.0.3/mm/swap.c linux-3.0.3/mm/swap.c
  	(*dtor)(page);
  }
  
-diff -urNp linux-3.0.3/mm/swapfile.c linux-3.0.3/mm/swapfile.c
---- linux-3.0.3/mm/swapfile.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/swapfile.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
+--- linux-3.0.4/mm/swapfile.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/swapfile.c	2011-08-23 21:47:56.000000000 -0400
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -64288,9 +67049,9 @@ diff -urNp linux-3.0.3/mm/swapfile.c linux-3.0.3/mm/swapfile.c
  	wake_up_interruptible(&proc_poll_wait);
  
  	if (S_ISREG(inode->i_mode))
-diff -urNp linux-3.0.3/mm/util.c linux-3.0.3/mm/util.c
---- linux-3.0.3/mm/util.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/util.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/util.c linux-3.0.4/mm/util.c
+--- linux-3.0.4/mm/util.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/util.c	2011-08-23 21:47:56.000000000 -0400
 @@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
   * allocated buffer. Use this if you don't want to free the buffer immediately
   * like, for example, with RCU.
@@ -64320,9 +67081,9 @@ diff -urNp linux-3.0.3/mm/util.c linux-3.0.3/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-3.0.3/mm/vmalloc.c linux-3.0.3/mm/vmalloc.c
---- linux-3.0.3/mm/vmalloc.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/mm/vmalloc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
+--- linux-3.0.4/mm/vmalloc.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/mm/vmalloc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -64555,9 +67316,9 @@ diff -urNp linux-3.0.3/mm/vmalloc.c linux-3.0.3/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-3.0.3/mm/vmstat.c linux-3.0.3/mm/vmstat.c
---- linux-3.0.3/mm/vmstat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/vmstat.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/vmstat.c linux-3.0.4/mm/vmstat.c
+--- linux-3.0.4/mm/vmstat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/vmstat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -64610,9 +67371,9 @@ diff -urNp linux-3.0.3/mm/vmstat.c linux-3.0.3/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-3.0.3/net/8021q/vlan.c linux-3.0.3/net/8021q/vlan.c
---- linux-3.0.3/net/8021q/vlan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/8021q/vlan.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/8021q/vlan.c linux-3.0.4/net/8021q/vlan.c
+--- linux-3.0.4/net/8021q/vlan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/8021q/vlan.c	2011-08-23 21:47:56.000000000 -0400
 @@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
@@ -64623,9 +67384,9 @@ diff -urNp linux-3.0.3/net/8021q/vlan.c linux-3.0.3/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-3.0.3/net/atm/atm_misc.c linux-3.0.3/net/atm/atm_misc.c
---- linux-3.0.3/net/atm/atm_misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/atm_misc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/atm_misc.c linux-3.0.4/net/atm/atm_misc.c
+--- linux-3.0.4/net/atm/atm_misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/atm_misc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int 
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
@@ -64662,9 +67423,9 @@ diff -urNp linux-3.0.3/net/atm/atm_misc.c linux-3.0.3/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.3/net/atm/lec.h linux-3.0.3/net/atm/lec.h
---- linux-3.0.3/net/atm/lec.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/lec.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/lec.h linux-3.0.4/net/atm/lec.h
+--- linux-3.0.4/net/atm/lec.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/lec.h	2011-08-23 21:47:56.000000000 -0400
 @@ -48,7 +48,7 @@ struct lane2_ops {
  			      const u8 *tlvs, u32 sizeoftlvs);
  	void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -64674,9 +67435,9 @@ diff -urNp linux-3.0.3/net/atm/lec.h linux-3.0.3/net/atm/lec.h
  
  /*
   * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-3.0.3/net/atm/mpc.h linux-3.0.3/net/atm/mpc.h
---- linux-3.0.3/net/atm/mpc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/mpc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/mpc.h linux-3.0.4/net/atm/mpc.h
+--- linux-3.0.4/net/atm/mpc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/mpc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@ struct mpoa_client {
  	struct mpc_parameters parameters;  /* parameters for this client    */
  
@@ -64686,9 +67447,9 @@ diff -urNp linux-3.0.3/net/atm/mpc.h linux-3.0.3/net/atm/mpc.h
  };
  
  
-diff -urNp linux-3.0.3/net/atm/mpoa_caches.c linux-3.0.3/net/atm/mpoa_caches.c
---- linux-3.0.3/net/atm/mpoa_caches.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/mpoa_caches.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/mpoa_caches.c linux-3.0.4/net/atm/mpoa_caches.c
+--- linux-3.0.4/net/atm/mpoa_caches.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/mpoa_caches.c	2011-08-23 21:48:14.000000000 -0400
 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru
  	struct timeval now;
  	struct k_message msg;
@@ -64698,9 +67459,9 @@ diff -urNp linux-3.0.3/net/atm/mpoa_caches.c linux-3.0.3/net/atm/mpoa_caches.c
  	do_gettimeofday(&now);
  
  	read_lock_bh(&client->ingress_lock);
-diff -urNp linux-3.0.3/net/atm/proc.c linux-3.0.3/net/atm/proc.c
---- linux-3.0.3/net/atm/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/proc.c linux-3.0.4/net/atm/proc.c
+--- linux-3.0.4/net/atm/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/proc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -64714,9 +67475,9 @@ diff -urNp linux-3.0.3/net/atm/proc.c linux-3.0.3/net/atm/proc.c
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-3.0.3/net/atm/resources.c linux-3.0.3/net/atm/resources.c
---- linux-3.0.3/net/atm/resources.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/resources.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/resources.c linux-3.0.4/net/atm/resources.c
+--- linux-3.0.4/net/atm/resources.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/resources.c	2011-08-23 21:47:56.000000000 -0400
 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
@@ -64735,9 +67496,9 @@ diff -urNp linux-3.0.3/net/atm/resources.c linux-3.0.3/net/atm/resources.c
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.3/net/batman-adv/hard-interface.c linux-3.0.3/net/batman-adv/hard-interface.c
---- linux-3.0.3/net/batman-adv/hard-interface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/hard-interface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/hard-interface.c linux-3.0.4/net/batman-adv/hard-interface.c
+--- linux-3.0.4/net/batman-adv/hard-interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/hard-interface.c	2011-08-23 21:47:56.000000000 -0400
 @@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_
  	hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
  	dev_add_pack(&hard_iface->batman_adv_ptype);
@@ -64749,9 +67510,9 @@ diff -urNp linux-3.0.3/net/batman-adv/hard-interface.c linux-3.0.3/net/batman-ad
  	bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
  		 hard_iface->net_dev->name);
  
-diff -urNp linux-3.0.3/net/batman-adv/routing.c linux-3.0.3/net/batman-adv/routing.c
---- linux-3.0.3/net/batman-adv/routing.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/routing.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/routing.c linux-3.0.4/net/batman-adv/routing.c
+--- linux-3.0.4/net/batman-adv/routing.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/routing.c	2011-08-23 21:47:56.000000000 -0400
 @@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e
  		return;
  
@@ -64761,9 +67522,9 @@ diff -urNp linux-3.0.3/net/batman-adv/routing.c linux-3.0.3/net/batman-adv/routi
  
  	has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-3.0.3/net/batman-adv/send.c linux-3.0.3/net/batman-adv/send.c
---- linux-3.0.3/net/batman-adv/send.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/send.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/send.c linux-3.0.4/net/batman-adv/send.c
+--- linux-3.0.4/net/batman-adv/send.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/send.c	2011-08-23 21:47:56.000000000 -0400
 @@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa
  
  	/* change sequence number to network order */
@@ -64782,9 +67543,9 @@ diff -urNp linux-3.0.3/net/batman-adv/send.c linux-3.0.3/net/batman-adv/send.c
  
  	slide_own_bcast_window(hard_iface);
  	send_time = own_send_time(bat_priv);
-diff -urNp linux-3.0.3/net/batman-adv/soft-interface.c linux-3.0.3/net/batman-adv/soft-interface.c
---- linux-3.0.3/net/batman-adv/soft-interface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/soft-interface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/soft-interface.c linux-3.0.4/net/batman-adv/soft-interface.c
+--- linux-3.0.4/net/batman-adv/soft-interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/soft-interface.c	2011-08-23 21:47:56.000000000 -0400
 @@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st
  
  		/* set broadcast sequence number */
@@ -64803,9 +67564,9 @@ diff -urNp linux-3.0.3/net/batman-adv/soft-interface.c linux-3.0.3/net/batman-ad
  	atomic_set(&bat_priv->tt_local_changed, 0);
  
  	bat_priv->primary_if = NULL;
-diff -urNp linux-3.0.3/net/batman-adv/types.h linux-3.0.3/net/batman-adv/types.h
---- linux-3.0.3/net/batman-adv/types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
+--- linux-3.0.4/net/batman-adv/types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/types.h	2011-08-23 21:47:56.000000000 -0400
 @@ -38,8 +38,8 @@ struct hard_iface {
  	int16_t if_num;
  	char if_status;
@@ -64826,9 +67587,9 @@ diff -urNp linux-3.0.3/net/batman-adv/types.h linux-3.0.3/net/batman-adv/types.h
  	atomic_t bcast_queue_left;
  	atomic_t batman_queue_left;
  	char num_ifaces;
-diff -urNp linux-3.0.3/net/batman-adv/unicast.c linux-3.0.3/net/batman-adv/unicast.c
---- linux-3.0.3/net/batman-adv/unicast.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/unicast.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/unicast.c linux-3.0.4/net/batman-adv/unicast.c
+--- linux-3.0.4/net/batman-adv/unicast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/unicast.c	2011-08-23 21:47:56.000000000 -0400
 @@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s
  	frag1->flags = UNI_FRAG_HEAD | large_tail;
  	frag2->flags = large_tail;
@@ -64838,9 +67599,9 @@ diff -urNp linux-3.0.3/net/batman-adv/unicast.c linux-3.0.3/net/batman-adv/unica
  	frag1->seqno = htons(seqno - 1);
  	frag2->seqno = htons(seqno);
  
-diff -urNp linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3/net/bridge/br_multicast.c
---- linux-3.0.3/net/bridge/br_multicast.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/bridge/br_multicast.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4/net/bridge/br_multicast.c
+--- linux-3.0.4/net/bridge/br_multicast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/bridge/br_multicast.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct 
  	nexthdr = ip6h->nexthdr;
  	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -64850,9 +67611,9 @@ diff -urNp linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3/net/bridge/br_multi
  		return 0;
  
  	/* Okay, we found ICMPv6 header */
-diff -urNp linux-3.0.3/net/bridge/netfilter/ebtables.c linux-3.0.3/net/bridge/netfilter/ebtables.c
---- linux-3.0.3/net/bridge/netfilter/ebtables.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/bridge/netfilter/ebtables.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/netfilter/ebtables.c
+--- linux-3.0.4/net/bridge/netfilter/ebtables.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/bridge/netfilter/ebtables.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
  			tmp.valid_hooks = t->table->valid_hooks;
  		}
@@ -64871,9 +67632,9 @@ diff -urNp linux-3.0.3/net/bridge/netfilter/ebtables.c linux-3.0.3/net/bridge/ne
  	memset(&tinfo, 0, sizeof(tinfo));
  
  	if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-3.0.3/net/caif/caif_socket.c linux-3.0.3/net/caif/caif_socket.c
---- linux-3.0.3/net/caif/caif_socket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/caif/caif_socket.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/caif/caif_socket.c linux-3.0.4/net/caif/caif_socket.c
+--- linux-3.0.4/net/caif/caif_socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/caif/caif_socket.c	2011-08-23 21:47:56.000000000 -0400
 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
@@ -65003,9 +67764,9 @@ diff -urNp linux-3.0.3/net/caif/caif_socket.c linux-3.0.3/net/caif/caif_socket.c
  #ifdef CONFIG_DEBUG_FS
  	if (!IS_ERR(debugfsdir)) {
  
-diff -urNp linux-3.0.3/net/caif/cfctrl.c linux-3.0.3/net/caif/cfctrl.c
---- linux-3.0.3/net/caif/cfctrl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/caif/cfctrl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/caif/cfctrl.c linux-3.0.4/net/caif/cfctrl.c
+--- linux-3.0.4/net/caif/cfctrl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/caif/cfctrl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -65053,9 +67814,9 @@ diff -urNp linux-3.0.3/net/caif/cfctrl.c linux-3.0.3/net/caif/cfctrl.c
  
  	cfpkt_extr_head(pkt, &cmdrsp, 1);
  	cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-3.0.3/net/core/datagram.c linux-3.0.3/net/core/datagram.c
---- linux-3.0.3/net/core/datagram.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/datagram.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/core/datagram.c linux-3.0.4/net/core/datagram.c
+--- linux-3.0.4/net/core/datagram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/datagram.c	2011-08-23 21:47:56.000000000 -0400
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
  	}
  
@@ -65065,9 +67826,9 @@ diff -urNp linux-3.0.3/net/core/datagram.c linux-3.0.3/net/core/datagram.c
  	sk_mem_reclaim_partial(sk);
  
  	return err;
-diff -urNp linux-3.0.3/net/core/dev.c linux-3.0.3/net/core/dev.c
---- linux-3.0.3/net/core/dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/dev.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
+--- linux-3.0.4/net/core/dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/dev.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
@@ -65110,9 +67871,9 @@ diff -urNp linux-3.0.3/net/core/dev.c linux-3.0.3/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-3.0.3/net/core/flow.c linux-3.0.3/net/core/flow.c
---- linux-3.0.3/net/core/flow.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/flow.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
+--- linux-3.0.4/net/core/flow.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/flow.c	2011-08-23 21:47:56.000000000 -0400
 @@ -60,7 +60,7 @@ struct flow_cache {
  	struct timer_list		rnd_timer;
  };
@@ -65149,9 +67910,9 @@ diff -urNp linux-3.0.3/net/core/flow.c linux-3.0.3/net/core/flow.c
  		if (!IS_ERR(flo))
  			fle->object = flo;
  		else
-diff -urNp linux-3.0.3/net/core/rtnetlink.c linux-3.0.3/net/core/rtnetlink.c
---- linux-3.0.3/net/core/rtnetlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/rtnetlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/core/rtnetlink.c linux-3.0.4/net/core/rtnetlink.c
+--- linux-3.0.4/net/core/rtnetlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/rtnetlink.c	2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@
  struct rtnl_link {
  	rtnl_doit_func		doit;
@@ -65161,9 +67922,9 @@ diff -urNp linux-3.0.3/net/core/rtnetlink.c linux-3.0.3/net/core/rtnetlink.c
  
  static DEFINE_MUTEX(rtnl_mutex);
  
-diff -urNp linux-3.0.3/net/core/skbuff.c linux-3.0.3/net/core/skbuff.c
---- linux-3.0.3/net/core/skbuff.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/skbuff.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/core/skbuff.c linux-3.0.4/net/core/skbuff.c
+--- linux-3.0.4/net/core/skbuff.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/skbuff.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb,
  	struct sock *sk = skb->sk;
  	int ret = 0;
@@ -65173,9 +67934,9 @@ diff -urNp linux-3.0.3/net/core/skbuff.c linux-3.0.3/net/core/skbuff.c
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-diff -urNp linux-3.0.3/net/core/sock.c linux-3.0.3/net/core/sock.c
---- linux-3.0.3/net/core/sock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/sock.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
+--- linux-3.0.4/net/core/sock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/sock.c	2011-08-23 21:48:14.000000000 -0400
 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	 */
  	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
@@ -65257,9 +68018,9 @@ diff -urNp linux-3.0.3/net/core/sock.c linux-3.0.3/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-3.0.3/net/decnet/sysctl_net_decnet.c linux-3.0.3/net/decnet/sysctl_net_decnet.c
---- linux-3.0.3/net/decnet/sysctl_net_decnet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/decnet/sysctl_net_decnet.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sysctl_net_decnet.c
+--- linux-3.0.4/net/decnet/sysctl_net_decnet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/decnet/sysctl_net_decnet.c	2011-08-23 21:47:56.000000000 -0400
 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
@@ -65278,9 +68039,9 @@ diff -urNp linux-3.0.3/net/decnet/sysctl_net_decnet.c linux-3.0.3/net/decnet/sys
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-3.0.3/net/econet/Kconfig linux-3.0.3/net/econet/Kconfig
---- linux-3.0.3/net/econet/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/econet/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/econet/Kconfig linux-3.0.4/net/econet/Kconfig
+--- linux-3.0.4/net/econet/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/econet/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -65290,9 +68051,9 @@ diff -urNp linux-3.0.3/net/econet/Kconfig linux-3.0.3/net/econet/Kconfig
  	---help---
  	  Econet is a fairly old and slow networking protocol mainly used by
  	  Acorn computers to access file and print servers. It uses native
-diff -urNp linux-3.0.3/net/ipv4/fib_frontend.c linux-3.0.3/net/ipv4/fib_frontend.c
---- linux-3.0.3/net/ipv4/fib_frontend.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/fib_frontend.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/fib_frontend.c linux-3.0.4/net/ipv4/fib_frontend.c
+--- linux-3.0.4/net/ipv4/fib_frontend.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/fib_frontend.c	2011-08-23 21:47:56.000000000 -0400
 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  		fib_sync_up(dev);
@@ -65317,9 +68078,9 @@ diff -urNp linux-3.0.3/net/ipv4/fib_frontend.c linux-3.0.3/net/ipv4/fib_frontend
  		rt_cache_flush(dev_net(dev), -1);
  		break;
  	case NETDEV_DOWN:
-diff -urNp linux-3.0.3/net/ipv4/fib_semantics.c linux-3.0.3/net/ipv4/fib_semantics.c
---- linux-3.0.3/net/ipv4/fib_semantics.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/fib_semantics.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/fib_semantics.c linux-3.0.4/net/ipv4/fib_semantics.c
+--- linux-3.0.4/net/ipv4/fib_semantics.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/fib_semantics.c	2011-08-23 21:47:56.000000000 -0400
 @@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n
  	nh->nh_saddr = inet_select_addr(nh->nh_dev,
  					nh->nh_gw,
@@ -65329,9 +68090,9 @@ diff -urNp linux-3.0.3/net/ipv4/fib_semantics.c linux-3.0.3/net/ipv4/fib_semanti
  
  	return nh->nh_saddr;
  }
-diff -urNp linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3/net/ipv4/inet_diag.c
---- linux-3.0.3/net/ipv4/inet_diag.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/inet_diag.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4/net/ipv4/inet_diag.c
+--- linux-3.0.4/net/ipv4/inet_diag.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/inet_diag.c	2011-08-23 21:48:14.000000000 -0400
 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
@@ -65393,9 +68154,9 @@ diff -urNp linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3/net/ipv4/inet_diag.c
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3/net/ipv4/inet_hashtables.c
---- linux-3.0.3/net/ipv4/inet_hashtables.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/inet_hashtables.c	2011-08-23 21:55:24.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4/net/ipv4/inet_hashtables.c
+--- linux-3.0.4/net/ipv4/inet_hashtables.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/inet_hashtables.c	2011-08-23 21:55:24.000000000 -0400
 @@ -18,12 +18,15 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -65421,9 +68182,9 @@ diff -urNp linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3/net/ipv4/inet_hash
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			while (twrefcnt) {
-diff -urNp linux-3.0.3/net/ipv4/inetpeer.c linux-3.0.3/net/ipv4/inetpeer.c
---- linux-3.0.3/net/ipv4/inetpeer.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/inetpeer.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/inetpeer.c linux-3.0.4/net/ipv4/inetpeer.c
+--- linux-3.0.4/net/ipv4/inetpeer.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/inetpeer.c	2011-08-23 21:48:14.000000000 -0400
 @@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in
  	unsigned int sequence;
  	int invalidated, newrefcnt = 0;
@@ -65444,9 +68205,9 @@ diff -urNp linux-3.0.3/net/ipv4/inetpeer.c linux-3.0.3/net/ipv4/inetpeer.c
  		p->tcp_ts_stamp = 0;
  		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
  		p->rate_tokens = 0;
-diff -urNp linux-3.0.3/net/ipv4/ip_fragment.c linux-3.0.3/net/ipv4/ip_fragment.c
---- linux-3.0.3/net/ipv4/ip_fragment.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/ip_fragment.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/ip_fragment.c linux-3.0.4/net/ipv4/ip_fragment.c
+--- linux-3.0.4/net/ipv4/ip_fragment.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/ip_fragment.c	2011-08-23 21:47:56.000000000 -0400
 @@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
@@ -65456,9 +68217,9 @@ diff -urNp linux-3.0.3/net/ipv4/ip_fragment.c linux-3.0.3/net/ipv4/ip_fragment.c
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-3.0.3/net/ipv4/ip_sockglue.c linux-3.0.3/net/ipv4/ip_sockglue.c
---- linux-3.0.3/net/ipv4/ip_sockglue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/ip_sockglue.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/ip_sockglue.c linux-3.0.4/net/ipv4/ip_sockglue.c
+--- linux-3.0.4/net/ipv4/ip_sockglue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/ip_sockglue.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock 
  	int val;
  	int len;
@@ -65478,9 +68239,9 @@ diff -urNp linux-3.0.3/net/ipv4/ip_sockglue.c linux-3.0.3/net/ipv4/ip_sockglue.c
  			return -EFAULT;
  		return 0;
  	}
-diff -urNp linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-08-23 21:47:56.000000000 -0400
 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
@@ -65490,9 +68251,9 @@ diff -urNp linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.3/net/ip
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-3.0.3/net/ipv4/ping.c linux-3.0.3/net/ipv4/ping.c
---- linux-3.0.3/net/ipv4/ping.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/ping.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/ping.c linux-3.0.4/net/ipv4/ping.c
+--- linux-3.0.4/net/ipv4/ping.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/ping.c	2011-08-23 21:47:56.000000000 -0400
 @@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -65502,9 +68263,9 @@ diff -urNp linux-3.0.3/net/ipv4/ping.c linux-3.0.3/net/ipv4/ping.c
  }
  
  static int ping_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv4/raw.c linux-3.0.3/net/ipv4/raw.c
---- linux-3.0.3/net/ipv4/raw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/raw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
+--- linux-3.0.4/net/ipv4/raw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/raw.c	2011-08-23 21:48:14.000000000 -0400
 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
@@ -65563,9 +68324,9 @@ diff -urNp linux-3.0.3/net/ipv4/raw.c linux-3.0.3/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv4/route.c linux-3.0.3/net/ipv4/route.c
---- linux-3.0.3/net/ipv4/route.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/route.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
+--- linux-3.0.4/net/ipv4/route.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/route.c	2011-08-23 21:47:56.000000000 -0400
 @@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
@@ -65593,9 +68354,9 @@ diff -urNp linux-3.0.3/net/ipv4/route.c linux-3.0.3/net/ipv4/route.c
  		if (peer->tcp_ts_stamp) {
  			ts = peer->tcp_ts;
  			tsage = get_seconds() - peer->tcp_ts_stamp;
-diff -urNp linux-3.0.3/net/ipv4/tcp.c linux-3.0.3/net/ipv4/tcp.c
---- linux-3.0.3/net/ipv4/tcp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp.c linux-3.0.4/net/ipv4/tcp.c
+--- linux-3.0.4/net/ipv4/tcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
  	int val;
  	int err = 0;
@@ -65614,9 +68375,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp.c linux-3.0.3/net/ipv4/tcp.c
  	if (get_user(len, optlen))
  		return -EFAULT;
  
-diff -urNp linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3/net/ipv4/tcp_ipv4.c
---- linux-3.0.3/net/ipv4/tcp_ipv4.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_ipv4.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
+--- linux-3.0.4/net/ipv4/tcp_ipv4.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_ipv4.c	2011-08-23 21:48:14.000000000 -0400
 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -65712,9 +68473,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3/net/ipv4/tcp_minisocks.c
---- linux-3.0.3/net/ipv4/tcp_minisocks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_minisocks.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisocks.c
+--- linux-3.0.4/net/ipv4/tcp_minisocks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_minisocks.c	2011-08-23 21:48:14.000000000 -0400
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -65737,9 +68498,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3/net/ipv4/tcp_minisoc
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-3.0.3/net/ipv4/tcp_output.c linux-3.0.3/net/ipv4/tcp_output.c
---- linux-3.0.3/net/ipv4/tcp_output.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_output.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_output.c linux-3.0.4/net/ipv4/tcp_output.c
+--- linux-3.0.4/net/ipv4/tcp_output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_output.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
  	int mss;
  	int s_data_desired = 0;
@@ -65749,9 +68510,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_output.c linux-3.0.3/net/ipv4/tcp_output.c
  	if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
  		s_data_desired = cvp->s_data_desired;
  	skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
-diff -urNp linux-3.0.3/net/ipv4/tcp_probe.c linux-3.0.3/net/ipv4/tcp_probe.c
---- linux-3.0.3/net/ipv4/tcp_probe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_probe.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_probe.c linux-3.0.4/net/ipv4/tcp_probe.c
+--- linux-3.0.4/net/ipv4/tcp_probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_probe.c	2011-08-23 21:47:56.000000000 -0400
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
@@ -65761,9 +68522,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_probe.c linux-3.0.3/net/ipv4/tcp_probe.c
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-3.0.3/net/ipv4/tcp_timer.c linux-3.0.3/net/ipv4/tcp_timer.c
---- linux-3.0.3/net/ipv4/tcp_timer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_timer.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_timer.c linux-3.0.4/net/ipv4/tcp_timer.c
+--- linux-3.0.4/net/ipv4/tcp_timer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_timer.c	2011-08-23 21:48:14.000000000 -0400
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -65789,9 +68550,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_timer.c linux-3.0.3/net/ipv4/tcp_timer.c
  	if (retransmits_timed_out(sk, retry_until,
  				  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
  		/* Has it gone just too far? */
-diff -urNp linux-3.0.3/net/ipv4/udp.c linux-3.0.3/net/ipv4/udp.c
---- linux-3.0.3/net/ipv4/udp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/udp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
+--- linux-3.0.4/net/ipv4/udp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/udp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -65904,9 +68665,9 @@ diff -urNp linux-3.0.3/net/ipv4/udp.c linux-3.0.3/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv6/inet6_connection_sock.c linux-3.0.3/net/ipv6/inet6_connection_sock.c
---- linux-3.0.3/net/ipv6/inet6_connection_sock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv6/inet6_connection_sock.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/inet6_connection_sock.c linux-3.0.4/net/ipv6/inet6_connection_sock.c
+--- linux-3.0.4/net/ipv6/inet6_connection_sock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv6/inet6_connection_sock.c	2011-08-23 21:47:56.000000000 -0400
 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
  	{
@@ -65925,9 +68686,9 @@ diff -urNp linux-3.0.3/net/ipv6/inet6_connection_sock.c linux-3.0.3/net/ipv6/ine
  			__sk_dst_reset(sk);
  			dst = NULL;
  		}
-diff -urNp linux-3.0.3/net/ipv6/ipv6_sockglue.c linux-3.0.3/net/ipv6/ipv6_sockglue.c
---- linux-3.0.3/net/ipv6/ipv6_sockglue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv6/ipv6_sockglue.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/ipv6_sockglue.c linux-3.0.4/net/ipv6/ipv6_sockglue.c
+--- linux-3.0.4/net/ipv6/ipv6_sockglue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv6/ipv6_sockglue.c	2011-08-23 21:48:14.000000000 -0400
 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
  	int val, valbool;
  	int retv = -ENOPROTOOPT;
@@ -65946,9 +68707,9 @@ diff -urNp linux-3.0.3/net/ipv6/ipv6_sockglue.c linux-3.0.3/net/ipv6/ipv6_sockgl
  	if (ip6_mroute_opt(optname))
  		return ip6_mroute_getsockopt(sk, optname, optval, optlen);
  
-diff -urNp linux-3.0.3/net/ipv6/raw.c linux-3.0.3/net/ipv6/raw.c
---- linux-3.0.3/net/ipv6/raw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv6/raw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
+--- linux-3.0.4/net/ipv6/raw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv6/raw.c	2011-08-23 21:48:14.000000000 -0400
 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
  {
  	if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
@@ -66044,9 +68805,9 @@ diff -urNp linux-3.0.3/net/ipv6/raw.c linux-3.0.3/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3/net/ipv6/tcp_ipv6.c
---- linux-3.0.3/net/ipv6/tcp_ipv6.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv6/tcp_ipv6.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
+--- linux-3.0.4/net/ipv6/tcp_ipv6.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv6/tcp_ipv6.c	2011-08-23 21:48:14.000000000 -0400
 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -66146,9 +68907,9 @@ diff -urNp linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv6/udp.c linux-3.0.3/net/ipv6/udp.c
---- linux-3.0.3/net/ipv6/udp.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv6/udp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
+--- linux-3.0.4/net/ipv6/udp.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv6/udp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -66213,9 +68974,9 @@ diff -urNp linux-3.0.3/net/ipv6/udp.c linux-3.0.3/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/irda/ircomm/ircomm_tty.c linux-3.0.3/net/irda/ircomm/ircomm_tty.c
---- linux-3.0.3/net/irda/ircomm/ircomm_tty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/irda/ircomm/ircomm_tty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/irda/ircomm/ircomm_tty.c linux-3.0.4/net/irda/ircomm/ircomm_tty.c
+--- linux-3.0.4/net/irda/ircomm/ircomm_tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/irda/ircomm/ircomm_tty.c	2011-08-23 21:47:56.000000000 -0400
 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
@@ -66338,9 +69099,9 @@ diff -urNp linux-3.0.3/net/irda/ircomm/ircomm_tty.c linux-3.0.3/net/irda/ircomm/
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-3.0.3/net/iucv/af_iucv.c linux-3.0.3/net/iucv/af_iucv.c
---- linux-3.0.3/net/iucv/af_iucv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/iucv/af_iucv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/iucv/af_iucv.c linux-3.0.4/net/iucv/af_iucv.c
+--- linux-3.0.4/net/iucv/af_iucv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/iucv/af_iucv.c	2011-08-23 21:47:56.000000000 -0400
 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
  
  	write_lock_bh(&iucv_sk_list.lock);
@@ -66354,9 +69115,9 @@ diff -urNp linux-3.0.3/net/iucv/af_iucv.c linux-3.0.3/net/iucv/af_iucv.c
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-3.0.3/net/key/af_key.c linux-3.0.3/net/key/af_key.c
---- linux-3.0.3/net/key/af_key.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/key/af_key.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/key/af_key.c linux-3.0.4/net/key/af_key.c
+--- linux-3.0.4/net/key/af_key.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/key/af_key.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
  	struct xfrm_migrate m[XFRM_MAX_DEPTH];
  	struct xfrm_kmaddress k;
@@ -66379,9 +69140,9 @@ diff -urNp linux-3.0.3/net/key/af_key.c linux-3.0.3/net/key/af_key.c
  	} while (!res);
  	return res;
  }
-diff -urNp linux-3.0.3/net/lapb/lapb_iface.c linux-3.0.3/net/lapb/lapb_iface.c
---- linux-3.0.3/net/lapb/lapb_iface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/lapb/lapb_iface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/lapb/lapb_iface.c linux-3.0.4/net/lapb/lapb_iface.c
+--- linux-3.0.4/net/lapb/lapb_iface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/lapb/lapb_iface.c	2011-08-23 21:47:56.000000000 -0400
 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
  		goto out;
  
@@ -66445,9 +69206,9 @@ diff -urNp linux-3.0.3/net/lapb/lapb_iface.c linux-3.0.3/net/lapb/lapb_iface.c
  		used = 1;
  	}
  
-diff -urNp linux-3.0.3/net/mac80211/debugfs_sta.c linux-3.0.3/net/mac80211/debugfs_sta.c
---- linux-3.0.3/net/mac80211/debugfs_sta.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/debugfs_sta.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/debugfs_sta.c linux-3.0.4/net/mac80211/debugfs_sta.c
+--- linux-3.0.4/net/mac80211/debugfs_sta.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/debugfs_sta.c	2011-08-23 21:48:14.000000000 -0400
 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
  	struct tid_ampdu_rx *tid_rx;
  	struct tid_ampdu_tx *tid_tx;
@@ -66466,9 +69227,9 @@ diff -urNp linux-3.0.3/net/mac80211/debugfs_sta.c linux-3.0.3/net/mac80211/debug
  	p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
  			htc->ht_supported ? "" : "not ");
  	if (htc->ht_supported) {
-diff -urNp linux-3.0.3/net/mac80211/ieee80211_i.h linux-3.0.3/net/mac80211/ieee80211_i.h
---- linux-3.0.3/net/mac80211/ieee80211_i.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/ieee80211_i.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee80211_i.h
+--- linux-3.0.4/net/mac80211/ieee80211_i.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/ieee80211_i.h	2011-08-23 21:47:56.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -66486,9 +69247,9 @@ diff -urNp linux-3.0.3/net/mac80211/ieee80211_i.h linux-3.0.3/net/mac80211/ieee8
  	int monitors, cooked_mntrs;
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
-diff -urNp linux-3.0.3/net/mac80211/iface.c linux-3.0.3/net/mac80211/iface.c
---- linux-3.0.3/net/mac80211/iface.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/mac80211/iface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
+--- linux-3.0.4/net/mac80211/iface.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/mac80211/iface.c	2011-08-23 21:47:56.000000000 -0400
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
  		break;
  	}
@@ -66543,9 +69304,9 @@ diff -urNp linux-3.0.3/net/mac80211/iface.c linux-3.0.3/net/mac80211/iface.c
  		if (local->ops->napi_poll)
  			napi_disable(&local->napi);
  		ieee80211_clear_tx_pending(local);
-diff -urNp linux-3.0.3/net/mac80211/main.c linux-3.0.3/net/mac80211/main.c
---- linux-3.0.3/net/mac80211/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/main.c linux-3.0.4/net/mac80211/main.c
+--- linux-3.0.4/net/mac80211/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/main.c	2011-08-23 21:47:56.000000000 -0400
 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
@@ -66555,9 +69316,9 @@ diff -urNp linux-3.0.3/net/mac80211/main.c linux-3.0.3/net/mac80211/main.c
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-3.0.3/net/mac80211/mlme.c linux-3.0.3/net/mac80211/mlme.c
---- linux-3.0.3/net/mac80211/mlme.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/mac80211/mlme.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/mlme.c linux-3.0.4/net/mac80211/mlme.c
+--- linux-3.0.4/net/mac80211/mlme.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/mac80211/mlme.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1444,6 +1444,8 @@ static bool ieee80211_assoc_success(stru
  	bool have_higher_than_11mbit = false;
  	u16 ap_ht_cap_flags;
@@ -66567,9 +69328,9 @@ diff -urNp linux-3.0.3/net/mac80211/mlme.c linux-3.0.3/net/mac80211/mlme.c
  	/* AssocResp and ReassocResp have identical structure */
  
  	aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-3.0.3/net/mac80211/pm.c linux-3.0.3/net/mac80211/pm.c
---- linux-3.0.3/net/mac80211/pm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/pm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
+--- linux-3.0.4/net/mac80211/pm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/pm.c	2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211
  	cancel_work_sync(&local->dynamic_ps_enable_work);
  	del_timer_sync(&local->dynamic_ps_timer);
@@ -66588,9 +69349,9 @@ diff -urNp linux-3.0.3/net/mac80211/pm.c linux-3.0.3/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
   suspend:
-diff -urNp linux-3.0.3/net/mac80211/rate.c linux-3.0.3/net/mac80211/rate.c
---- linux-3.0.3/net/mac80211/rate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/rate.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/rate.c linux-3.0.4/net/mac80211/rate.c
+--- linux-3.0.4/net/mac80211/rate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/rate.c	2011-08-23 21:47:56.000000000 -0400
 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
  	ASSERT_RTNL();
@@ -66600,9 +69361,9 @@ diff -urNp linux-3.0.3/net/mac80211/rate.c linux-3.0.3/net/mac80211/rate.c
  		return -EBUSY;
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c
---- linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
  	spin_unlock_irqrestore(&events->lock, status);
@@ -66612,9 +69373,9 @@ diff -urNp linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c linux-3.0.3/net/mac802
  		return -EFAULT;
  
  	return p;
-diff -urNp linux-3.0.3/net/mac80211/util.c linux-3.0.3/net/mac80211/util.c
---- linux-3.0.3/net/mac80211/util.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/util.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/util.c linux-3.0.4/net/mac80211/util.c
+--- linux-3.0.4/net/mac80211/util.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/util.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
  #endif
  
@@ -66624,9 +69385,9 @@ diff -urNp linux-3.0.3/net/mac80211/util.c linux-3.0.3/net/mac80211/util.c
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c	2011-08-23 21:47:56.000000000 -0400
 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
  	/* Increase the refcnt counter of the dest */
  	atomic_inc(&dest->refcnt);
@@ -66654,9 +69415,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.3/net/netfilter
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c	2011-08-23 21:47:56.000000000 -0400
 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
  		ret = cp->packet_xmit(skb, cp, pd->pp);
  		/* do not touch skb anymore */
@@ -66675,9 +69436,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c linux-3.0.3/net/netfilter
  
  	if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
  	    cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
  		ip_vs_rs_hash(ipvs, dest);
  		write_unlock_bh(&ipvs->rs_lock);
@@ -66732,9 +69493,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.3/net/netfilter/
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c	2011-08-23 21:47:56.000000000 -0400
 @@ -648,7 +648,7 @@ control:
  	 * i.e only increment in_pkts for Templates.
  	 */
@@ -66753,9 +69514,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.3/net/netfilter
  	cp->state = state;
  	cp->old_state = cp->state;
  	/*
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
  		else
  			rc = NF_ACCEPT;
@@ -66774,9 +69535,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3/net/netfilter
  		goto out;
  	}
  
-diff -urNp linux-3.0.3/net/netfilter/Kconfig linux-3.0.3/net/netfilter/Kconfig
---- linux-3.0.3/net/netfilter/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/Kconfig linux-3.0.4/net/netfilter/Kconfig
+--- linux-3.0.4/net/netfilter/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
@@ -66794,9 +69555,9 @@ diff -urNp linux-3.0.3/net/netfilter/Kconfig linux-3.0.3/net/netfilter/Kconfig
  config NETFILTER_XT_MATCH_HASHLIMIT
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-3.0.3/net/netfilter/Makefile linux-3.0.3/net/netfilter/Makefile
---- linux-3.0.3/net/netfilter/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/Makefile	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/Makefile linux-3.0.4/net/netfilter/Makefile
+--- linux-3.0.4/net/netfilter/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/Makefile	2011-08-23 21:48:14.000000000 -0400
 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
  obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -66805,9 +69566,9 @@ diff -urNp linux-3.0.3/net/netfilter/Makefile linux-3.0.3/net/netfilter/Makefile
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-3.0.3/net/netfilter/nfnetlink_log.c linux-3.0.3/net/netfilter/nfnetlink_log.c
---- linux-3.0.3/net/netfilter/nfnetlink_log.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/nfnetlink_log.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/nfnetlink_log.c linux-3.0.4/net/netfilter/nfnetlink_log.c
+--- linux-3.0.4/net/netfilter/nfnetlink_log.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/nfnetlink_log.c	2011-08-23 21:47:56.000000000 -0400
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -66826,9 +69587,9 @@ diff -urNp linux-3.0.3/net/netfilter/nfnetlink_log.c linux-3.0.3/net/netfilter/n
  
  	if (data_len) {
  		struct nlattr *nla;
-diff -urNp linux-3.0.3/net/netfilter/nfnetlink_queue.c linux-3.0.3/net/netfilter/nfnetlink_queue.c
---- linux-3.0.3/net/netfilter/nfnetlink_queue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/nfnetlink_queue.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/nfnetlink_queue.c linux-3.0.4/net/netfilter/nfnetlink_queue.c
+--- linux-3.0.4/net/netfilter/nfnetlink_queue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/nfnetlink_queue.c	2011-08-23 21:47:56.000000000 -0400
 @@ -58,7 +58,7 @@ struct nfqnl_instance {
   */
  	spinlock_t	lock;
@@ -66856,9 +69617,9 @@ diff -urNp linux-3.0.3/net/netfilter/nfnetlink_queue.c linux-3.0.3/net/netfilter
  }
  
  static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-3.0.3/net/netfilter/xt_gradm.c linux-3.0.3/net/netfilter/xt_gradm.c
---- linux-3.0.3/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/net/netfilter/xt_gradm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/xt_gradm.c linux-3.0.4/net/netfilter/xt_gradm.c
+--- linux-3.0.4/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/net/netfilter/xt_gradm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -66911,9 +69672,9 @@ diff -urNp linux-3.0.3/net/netfilter/xt_gradm.c linux-3.0.3/net/netfilter/xt_gra
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-3.0.3/net/netfilter/xt_statistic.c linux-3.0.3/net/netfilter/xt_statistic.c
---- linux-3.0.3/net/netfilter/xt_statistic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/xt_statistic.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/xt_statistic.c linux-3.0.4/net/netfilter/xt_statistic.c
+--- linux-3.0.4/net/netfilter/xt_statistic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/xt_statistic.c	2011-08-23 21:47:56.000000000 -0400
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -66944,9 +69705,9 @@ diff -urNp linux-3.0.3/net/netfilter/xt_statistic.c linux-3.0.3/net/netfilter/xt
  
  	return 0;
  }
-diff -urNp linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3/net/netlink/af_netlink.c
---- linux-3.0.3/net/netlink/af_netlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netlink/af_netlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netlink.c
+--- linux-3.0.4/net/netlink/af_netlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netlink/af_netlink.c	2011-08-23 21:47:56.000000000 -0400
 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
  			sk->sk_error_report(sk);
  		}
@@ -66965,9 +69726,9 @@ diff -urNp linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3/net/netlink/af_netli
  			   sock_i_ino(s)
  			);
  
-diff -urNp linux-3.0.3/net/netrom/af_netrom.c linux-3.0.3/net/netrom/af_netrom.c
---- linux-3.0.3/net/netrom/af_netrom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netrom/af_netrom.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netrom/af_netrom.c linux-3.0.4/net/netrom/af_netrom.c
+--- linux-3.0.4/net/netrom/af_netrom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netrom/af_netrom.c	2011-08-23 21:48:14.000000000 -0400
 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
@@ -66984,9 +69745,9 @@ diff -urNp linux-3.0.3/net/netrom/af_netrom.c linux-3.0.3/net/netrom/af_netrom.c
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-3.0.3/net/packet/af_packet.c linux-3.0.3/net/packet/af_packet.c
---- linux-3.0.3/net/packet/af_packet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/packet/af_packet.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
+--- linux-3.0.4/net/packet/af_packet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/packet/af_packet.c	2011-08-23 21:47:56.000000000 -0400
 @@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
  
  	spin_lock(&sk->sk_receive_queue.lock);
@@ -67022,9 +69783,9 @@ diff -urNp linux-3.0.3/net/packet/af_packet.c linux-3.0.3/net/packet/af_packet.c
  		return -EFAULT;
  	return 0;
  }
-diff -urNp linux-3.0.3/net/phonet/af_phonet.c linux-3.0.3/net/phonet/af_phonet.c
---- linux-3.0.3/net/phonet/af_phonet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/phonet/af_phonet.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/phonet/af_phonet.c linux-3.0.4/net/phonet/af_phonet.c
+--- linux-3.0.4/net/phonet/af_phonet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/phonet/af_phonet.c	2011-08-23 21:48:14.000000000 -0400
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
@@ -67043,9 +69804,9 @@ diff -urNp linux-3.0.3/net/phonet/af_phonet.c linux-3.0.3/net/phonet/af_phonet.c
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-3.0.3/net/phonet/pep.c linux-3.0.3/net/phonet/pep.c
---- linux-3.0.3/net/phonet/pep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/phonet/pep.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/phonet/pep.c linux-3.0.4/net/phonet/pep.c
+--- linux-3.0.4/net/phonet/pep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/phonet/pep.c	2011-08-23 21:47:56.000000000 -0400
 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
  	case PNS_PEP_CTRL_REQ:
@@ -67073,9 +69834,9 @@ diff -urNp linux-3.0.3/net/phonet/pep.c linux-3.0.3/net/phonet/pep.c
  			err = NET_RX_DROP;
  			break;
  		}
-diff -urNp linux-3.0.3/net/phonet/socket.c linux-3.0.3/net/phonet/socket.c
---- linux-3.0.3/net/phonet/socket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/phonet/socket.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/phonet/socket.c linux-3.0.4/net/phonet/socket.c
+--- linux-3.0.4/net/phonet/socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/phonet/socket.c	2011-08-23 21:48:14.000000000 -0400
 @@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
  			pn->resource, sk->sk_state,
  			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -67092,9 +69853,9 @@ diff -urNp linux-3.0.3/net/phonet/socket.c linux-3.0.3/net/phonet/socket.c
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff -urNp linux-3.0.3/net/rds/cong.c linux-3.0.3/net/rds/cong.c
---- linux-3.0.3/net/rds/cong.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/cong.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/cong.c linux-3.0.4/net/rds/cong.c
+--- linux-3.0.4/net/rds/cong.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/cong.c	2011-08-23 21:47:56.000000000 -0400
 @@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -67122,9 +69883,9 @@ diff -urNp linux-3.0.3/net/rds/cong.c linux-3.0.3/net/rds/cong.c
  
  	if (likely(*recent == gen))
  		return 0;
-diff -urNp linux-3.0.3/net/rds/ib_cm.c linux-3.0.3/net/rds/ib_cm.c
---- linux-3.0.3/net/rds/ib_cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/ib_cm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/ib_cm.c linux-3.0.4/net/rds/ib_cm.c
+--- linux-3.0.4/net/rds/ib_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/ib_cm.c	2011-08-23 21:47:56.000000000 -0400
 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
  	/* Clear the ACK state */
  	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -67134,9 +69895,9 @@ diff -urNp linux-3.0.3/net/rds/ib_cm.c linux-3.0.3/net/rds/ib_cm.c
  #else
  	ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.3/net/rds/ib.h linux-3.0.3/net/rds/ib.h
---- linux-3.0.3/net/rds/ib.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/ib.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/ib.h linux-3.0.4/net/rds/ib.h
+--- linux-3.0.4/net/rds/ib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/ib.h	2011-08-23 21:47:56.000000000 -0400
 @@ -127,7 +127,7 @@ struct rds_ib_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
@@ -67146,9 +69907,9 @@ diff -urNp linux-3.0.3/net/rds/ib.h linux-3.0.3/net/rds/ib.h
  #else
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
-diff -urNp linux-3.0.3/net/rds/ib_recv.c linux-3.0.3/net/rds/ib_recv.c
---- linux-3.0.3/net/rds/ib_recv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/ib_recv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/ib_recv.c linux-3.0.4/net/rds/ib_recv.c
+--- linux-3.0.4/net/rds/ib_recv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/ib_recv.c	2011-08-23 21:47:56.000000000 -0400
 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
  static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
  				int ack_required)
@@ -67167,9 +69928,9 @@ diff -urNp linux-3.0.3/net/rds/ib_recv.c linux-3.0.3/net/rds/ib_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.3/net/rds/iw_cm.c linux-3.0.3/net/rds/iw_cm.c
---- linux-3.0.3/net/rds/iw_cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw_cm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw_cm.c linux-3.0.4/net/rds/iw_cm.c
+--- linux-3.0.4/net/rds/iw_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw_cm.c	2011-08-23 21:47:56.000000000 -0400
 @@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
  	/* Clear the ACK state */
  	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -67179,9 +69940,9 @@ diff -urNp linux-3.0.3/net/rds/iw_cm.c linux-3.0.3/net/rds/iw_cm.c
  #else
  	ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.3/net/rds/iw.h linux-3.0.3/net/rds/iw.h
---- linux-3.0.3/net/rds/iw.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw.h linux-3.0.4/net/rds/iw.h
+--- linux-3.0.4/net/rds/iw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw.h	2011-08-23 21:47:56.000000000 -0400
 @@ -133,7 +133,7 @@ struct rds_iw_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
@@ -67191,9 +69952,9 @@ diff -urNp linux-3.0.3/net/rds/iw.h linux-3.0.3/net/rds/iw.h
  #else
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
-diff -urNp linux-3.0.3/net/rds/iw_rdma.c linux-3.0.3/net/rds/iw_rdma.c
---- linux-3.0.3/net/rds/iw_rdma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw_rdma.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw_rdma.c linux-3.0.4/net/rds/iw_rdma.c
+--- linux-3.0.4/net/rds/iw_rdma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw_rdma.c	2011-08-23 21:48:14.000000000 -0400
 @@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
  	struct rdma_cm_id *pcm_id;
  	int rc;
@@ -67203,9 +69964,9 @@ diff -urNp linux-3.0.3/net/rds/iw_rdma.c linux-3.0.3/net/rds/iw_rdma.c
  	src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
  	dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-3.0.3/net/rds/iw_recv.c linux-3.0.3/net/rds/iw_recv.c
---- linux-3.0.3/net/rds/iw_recv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw_recv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw_recv.c linux-3.0.4/net/rds/iw_recv.c
+--- linux-3.0.4/net/rds/iw_recv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw_recv.c	2011-08-23 21:47:56.000000000 -0400
 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
  static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
  				int ack_required)
@@ -67224,9 +69985,9 @@ diff -urNp linux-3.0.3/net/rds/iw_recv.c linux-3.0.3/net/rds/iw_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.3/net/rxrpc/af_rxrpc.c linux-3.0.3/net/rxrpc/af_rxrpc.c
---- linux-3.0.3/net/rxrpc/af_rxrpc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/af_rxrpc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/af_rxrpc.c linux-3.0.4/net/rxrpc/af_rxrpc.c
+--- linux-3.0.4/net/rxrpc/af_rxrpc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/af_rxrpc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -67236,9 +69997,9 @@ diff -urNp linux-3.0.3/net/rxrpc/af_rxrpc.c linux-3.0.3/net/rxrpc/af_rxrpc.c
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-3.0.3/net/rxrpc/ar-ack.c linux-3.0.3/net/rxrpc/ar-ack.c
---- linux-3.0.3/net/rxrpc/ar-ack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-ack.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-ack.c linux-3.0.4/net/rxrpc/ar-ack.c
+--- linux-3.0.4/net/rxrpc/ar-ack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-ack.c	2011-08-23 21:48:14.000000000 -0400
 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  	_enter("{%d,%d,%d,%d},",
@@ -67311,9 +70072,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-ack.c linux-3.0.3/net/rxrpc/ar-ack.c
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-3.0.3/net/rxrpc/ar-call.c linux-3.0.3/net/rxrpc/ar-call.c
---- linux-3.0.3/net/rxrpc/ar-call.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-call.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-call.c linux-3.0.4/net/rxrpc/ar-call.c
+--- linux-3.0.4/net/rxrpc/ar-call.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-call.c	2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
  	spin_lock_init(&call->lock);
  	rwlock_init(&call->state_lock);
@@ -67323,9 +70084,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-call.c linux-3.0.3/net/rxrpc/ar-call.c
  	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
  	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-3.0.3/net/rxrpc/ar-connection.c linux-3.0.3/net/rxrpc/ar-connection.c
---- linux-3.0.3/net/rxrpc/ar-connection.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-connection.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-connection.c linux-3.0.4/net/rxrpc/ar-connection.c
+--- linux-3.0.4/net/rxrpc/ar-connection.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-connection.c	2011-08-23 21:47:56.000000000 -0400
 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
  		rwlock_init(&conn->lock);
  		spin_lock_init(&conn->state_lock);
@@ -67335,9 +70096,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-connection.c linux-3.0.3/net/rxrpc/ar-connec
  		conn->avail_calls = RXRPC_MAXCALLS;
  		conn->size_align = 4;
  		conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-3.0.3/net/rxrpc/ar-connevent.c linux-3.0.3/net/rxrpc/ar-connevent.c
---- linux-3.0.3/net/rxrpc/ar-connevent.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-connevent.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-connevent.c linux-3.0.4/net/rxrpc/ar-connevent.c
+--- linux-3.0.4/net/rxrpc/ar-connevent.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-connevent.c	2011-08-23 21:47:56.000000000 -0400
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
  	len = iov[0].iov_len + iov[1].iov_len;
@@ -67347,9 +70108,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-connevent.c linux-3.0.3/net/rxrpc/ar-conneve
  	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-3.0.3/net/rxrpc/ar-input.c linux-3.0.3/net/rxrpc/ar-input.c
---- linux-3.0.3/net/rxrpc/ar-input.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-input.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-input.c linux-3.0.4/net/rxrpc/ar-input.c
+--- linux-3.0.4/net/rxrpc/ar-input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-input.c	2011-08-23 21:47:56.000000000 -0400
 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
  	/* track the latest serial number on this connection for ACK packet
  	 * information */
@@ -67362,9 +70123,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-input.c linux-3.0.3/net/rxrpc/ar-input.c
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-3.0.3/net/rxrpc/ar-internal.h linux-3.0.3/net/rxrpc/ar-internal.h
---- linux-3.0.3/net/rxrpc/ar-internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-internal.h linux-3.0.4/net/rxrpc/ar-internal.h
+--- linux-3.0.4/net/rxrpc/ar-internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
  	int			error;		/* error code for local abort */
  	int			debug_id;	/* debug ID for printks */
@@ -67394,9 +70155,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-internal.h linux-3.0.3/net/rxrpc/ar-internal
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-3.0.3/net/rxrpc/ar-local.c linux-3.0.3/net/rxrpc/ar-local.c
---- linux-3.0.3/net/rxrpc/ar-local.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-local.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-local.c linux-3.0.4/net/rxrpc/ar-local.c
+--- linux-3.0.4/net/rxrpc/ar-local.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-local.c	2011-08-23 21:47:56.000000000 -0400
 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
  		spin_lock_init(&local->lock);
  		rwlock_init(&local->services_lock);
@@ -67406,9 +70167,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-local.c linux-3.0.3/net/rxrpc/ar-local.c
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff -urNp linux-3.0.3/net/rxrpc/ar-output.c linux-3.0.3/net/rxrpc/ar-output.c
---- linux-3.0.3/net/rxrpc/ar-output.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-output.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-output.c linux-3.0.4/net/rxrpc/ar-output.c
+--- linux-3.0.4/net/rxrpc/ar-output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-output.c	2011-08-23 21:47:56.000000000 -0400
 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
  			sp->hdr.cid = call->cid;
  			sp->hdr.callNumber = call->call_id;
@@ -67421,9 +70182,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-output.c linux-3.0.3/net/rxrpc/ar-output.c
  			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
  			sp->hdr.userStatus = 0;
  			sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-3.0.3/net/rxrpc/ar-peer.c linux-3.0.3/net/rxrpc/ar-peer.c
---- linux-3.0.3/net/rxrpc/ar-peer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-peer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-peer.c linux-3.0.4/net/rxrpc/ar-peer.c
+--- linux-3.0.4/net/rxrpc/ar-peer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-peer.c	2011-08-23 21:47:56.000000000 -0400
 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
  		INIT_LIST_HEAD(&peer->error_targets);
  		spin_lock_init(&peer->lock);
@@ -67433,9 +70194,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-peer.c linux-3.0.3/net/rxrpc/ar-peer.c
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff -urNp linux-3.0.3/net/rxrpc/ar-proc.c linux-3.0.3/net/rxrpc/ar-proc.c
---- linux-3.0.3/net/rxrpc/ar-proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-proc.c linux-3.0.4/net/rxrpc/ar-proc.c
+--- linux-3.0.4/net/rxrpc/ar-proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-proc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
  		   atomic_read(&conn->usage),
  		   rxrpc_conn_states[conn->state],
@@ -67447,9 +70208,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-proc.c linux-3.0.3/net/rxrpc/ar-proc.c
  
  	return 0;
  }
-diff -urNp linux-3.0.3/net/rxrpc/ar-transport.c linux-3.0.3/net/rxrpc/ar-transport.c
---- linux-3.0.3/net/rxrpc/ar-transport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-transport.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-transport.c linux-3.0.4/net/rxrpc/ar-transport.c
+--- linux-3.0.4/net/rxrpc/ar-transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-transport.c	2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
  		spin_lock_init(&trans->client_lock);
  		rwlock_init(&trans->conn_lock);
@@ -67459,9 +70220,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-transport.c linux-3.0.3/net/rxrpc/ar-transpo
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff -urNp linux-3.0.3/net/rxrpc/rxkad.c linux-3.0.3/net/rxrpc/rxkad.c
---- linux-3.0.3/net/rxrpc/rxkad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/rxkad.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/rxkad.c linux-3.0.4/net/rxrpc/rxkad.c
+--- linux-3.0.4/net/rxrpc/rxkad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/rxkad.c	2011-08-23 21:48:14.000000000 -0400
 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
  	u16 check;
  	int nsg;
@@ -67498,9 +70259,9 @@ diff -urNp linux-3.0.3/net/rxrpc/rxkad.c linux-3.0.3/net/rxrpc/rxkad.c
  	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-3.0.3/net/sctp/proc.c linux-3.0.3/net/sctp/proc.c
---- linux-3.0.3/net/sctp/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sctp/proc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/sctp/proc.c linux-3.0.4/net/sctp/proc.c
+--- linux-3.0.4/net/sctp/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sctp/proc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
  		seq_printf(seq,
  			   "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -67511,9 +70272,9 @@ diff -urNp linux-3.0.3/net/sctp/proc.c linux-3.0.3/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-3.0.3/net/sctp/socket.c linux-3.0.3/net/sctp/socket.c
---- linux-3.0.3/net/sctp/socket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sctp/socket.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sctp/socket.c linux-3.0.4/net/sctp/socket.c
+--- linux-3.0.4/net/sctp/socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sctp/socket.c	2011-08-23 21:47:56.000000000 -0400
 @@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st
  		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
  		if (space_left < addrlen)
@@ -67523,9 +70284,9 @@ diff -urNp linux-3.0.3/net/sctp/socket.c linux-3.0.3/net/sctp/socket.c
  			return -EFAULT;
  		to += addrlen;
  		cnt++;
-diff -urNp linux-3.0.3/net/socket.c linux-3.0.3/net/socket.c
---- linux-3.0.3/net/socket.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/socket.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
+--- linux-3.0.4/net/socket.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/socket.c	2011-08-23 21:48:14.000000000 -0400
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -67685,9 +70446,9 @@ diff -urNp linux-3.0.3/net/socket.c linux-3.0.3/net/socket.c
  	err = -EFAULT;
  	if (MSG_CMSG_COMPAT & flags) {
  		if (get_compat_msghdr(msg_sys, msg_compat))
-diff -urNp linux-3.0.3/net/sunrpc/sched.c linux-3.0.3/net/sunrpc/sched.c
---- linux-3.0.3/net/sunrpc/sched.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/sched.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/sched.c linux-3.0.4/net/sunrpc/sched.c
+--- linux-3.0.4/net/sunrpc/sched.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/sched.c	2011-08-23 21:47:56.000000000 -0400
 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -67700,9 +70461,9 @@ diff -urNp linux-3.0.3/net/sunrpc/sched.c linux-3.0.3/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-08-23 21:47:56.000000000 -0400
 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
@@ -67810,9 +70571,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.3/net/sunrpc/xpr
  		.mode		= 0644,
  		.proc_handler	= read_reset_stat,
  	},
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-08-23 21:47:56.000000000 -0400
 @@ -499,7 +499,7 @@ next_sge:
  			svc_rdma_put_context(ctxt, 0);
  			goto out;
@@ -67840,9 +70601,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.3/net/s
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-08-23 21:47:56.000000000 -0400
 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
  	write_wr.wr.rdma.remote_addr = to;
  
@@ -67852,9 +70613,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.3/net/sun
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-08-23 21:47:56.000000000 -0400
 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
  		return;
  
@@ -67900,9 +70661,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.3/net/
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff -urNp linux-3.0.3/net/sysctl_net.c linux-3.0.3/net/sysctl_net.c
---- linux-3.0.3/net/sysctl_net.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sysctl_net.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/sysctl_net.c linux-3.0.4/net/sysctl_net.c
+--- linux-3.0.4/net/sysctl_net.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sysctl_net.c	2011-08-23 21:48:14.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
@@ -67912,9 +70673,9 @@ diff -urNp linux-3.0.3/net/sysctl_net.c linux-3.0.3/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-3.0.3/net/unix/af_unix.c linux-3.0.3/net/unix/af_unix.c
---- linux-3.0.3/net/unix/af_unix.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/unix/af_unix.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/unix/af_unix.c linux-3.0.4/net/unix/af_unix.c
+--- linux-3.0.4/net/unix/af_unix.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/unix/af_unix.c	2011-08-23 21:48:14.000000000 -0400
 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
@@ -67961,9 +70722,9 @@ diff -urNp linux-3.0.3/net/unix/af_unix.c linux-3.0.3/net/unix/af_unix.c
  		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
  		dput(nd.path.dentry);
  		nd.path.dentry = dentry;
-diff -urNp linux-3.0.3/net/wireless/core.h linux-3.0.3/net/wireless/core.h
---- linux-3.0.3/net/wireless/core.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/wireless/core.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/wireless/core.h linux-3.0.4/net/wireless/core.h
+--- linux-3.0.4/net/wireless/core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/wireless/core.h	2011-08-23 21:47:56.000000000 -0400
 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
  	struct mutex mtx;
  
@@ -67973,9 +70734,9 @@ diff -urNp linux-3.0.3/net/wireless/core.h linux-3.0.3/net/wireless/core.h
  	struct rfkill *rfkill;
  	struct work_struct rfkill_sync;
  
-diff -urNp linux-3.0.3/net/wireless/wext-core.c linux-3.0.3/net/wireless/wext-core.c
---- linux-3.0.3/net/wireless/wext-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/wireless/wext-core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/wireless/wext-core.c linux-3.0.4/net/wireless/wext-core.c
+--- linux-3.0.4/net/wireless/wext-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/wireless/wext-core.c	2011-08-23 21:47:56.000000000 -0400
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -68009,9 +70770,9 @@ diff -urNp linux-3.0.3/net/wireless/wext-core.c linux-3.0.3/net/wireless/wext-co
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-3.0.3/net/xfrm/xfrm_policy.c linux-3.0.3/net/xfrm/xfrm_policy.c
---- linux-3.0.3/net/xfrm/xfrm_policy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/xfrm/xfrm_policy.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
+--- linux-3.0.4/net/xfrm/xfrm_policy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/xfrm/xfrm_policy.c	2011-08-23 21:47:56.000000000 -0400
 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
  {
  	policy->walk.dead = 1;
@@ -68084,9 +70845,9 @@ diff -urNp linux-3.0.3/net/xfrm/xfrm_policy.c linux-3.0.3/net/xfrm/xfrm_policy.c
  		}
  	}
  
-diff -urNp linux-3.0.3/net/xfrm/xfrm_user.c linux-3.0.3/net/xfrm/xfrm_user.c
---- linux-3.0.3/net/xfrm/xfrm_user.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/xfrm/xfrm_user.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/xfrm/xfrm_user.c linux-3.0.4/net/xfrm/xfrm_user.c
+--- linux-3.0.4/net/xfrm/xfrm_user.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/xfrm/xfrm_user.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
  	struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
  	int i;
@@ -68105,9 +70866,9 @@ diff -urNp linux-3.0.3/net/xfrm/xfrm_user.c linux-3.0.3/net/xfrm/xfrm_user.c
  	if (attrs[XFRMA_MIGRATE] == NULL)
  		return -EINVAL;
  
-diff -urNp linux-3.0.3/scripts/basic/fixdep.c linux-3.0.3/scripts/basic/fixdep.c
---- linux-3.0.3/scripts/basic/fixdep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/basic/fixdep.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
+--- linux-3.0.4/scripts/basic/fixdep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/basic/fixdep.c	2011-08-23 21:47:56.000000000 -0400
 @@ -235,9 +235,9 @@ static void use_config(const char *m, in
  
  static void parse_config_file(const char *map, size_t len)
@@ -68129,15 +70890,15 @@ diff -urNp linux-3.0.3/scripts/basic/fixdep.c linux-3.0.3/scripts/basic/fixdep.c
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-3.0.3/scripts/gcc-plugin.sh linux-3.0.3/scripts/gcc-plugin.sh
---- linux-3.0.3/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/scripts/gcc-plugin.sh	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/gcc-plugin.sh linux-3.0.4/scripts/gcc-plugin.sh
+--- linux-3.0.4/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/scripts/gcc-plugin.sh	2011-08-23 21:47:56.000000000 -0400
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$* -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-3.0.3/scripts/Makefile.build linux-3.0.3/scripts/Makefile.build
---- linux-3.0.3/scripts/Makefile.build	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/Makefile.build	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefile.build
+--- linux-3.0.4/scripts/Makefile.build	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/Makefile.build	2011-08-23 21:47:56.000000000 -0400
 @@ -109,7 +109,7 @@ endif
  endif
  
@@ -68147,9 +70908,9 @@ diff -urNp linux-3.0.3/scripts/Makefile.build linux-3.0.3/scripts/Makefile.build
  include scripts/Makefile.host
  endif
  
-diff -urNp linux-3.0.3/scripts/Makefile.clean linux-3.0.3/scripts/Makefile.clean
---- linux-3.0.3/scripts/Makefile.clean	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/Makefile.clean	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/Makefile.clean linux-3.0.4/scripts/Makefile.clean
+--- linux-3.0.4/scripts/Makefile.clean	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/Makefile.clean	2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,8 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subd
  __clean-files	:= $(extra-y) $(always)                  \
  		   $(targets) $(clean-files)             \
@@ -68160,9 +70921,9 @@ diff -urNp linux-3.0.3/scripts/Makefile.clean linux-3.0.3/scripts/Makefile.clean
  
  __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
  
-diff -urNp linux-3.0.3/scripts/Makefile.host linux-3.0.3/scripts/Makefile.host
---- linux-3.0.3/scripts/Makefile.host	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/Makefile.host	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/Makefile.host linux-3.0.4/scripts/Makefile.host
+--- linux-3.0.4/scripts/Makefile.host	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/Makefile.host	2011-08-23 21:47:56.000000000 -0400
 @@ -31,6 +31,7 @@
  # Note: Shared libraries consisting of C++ files are not supported
  
@@ -68179,9 +70940,9 @@ diff -urNp linux-3.0.3/scripts/Makefile.host linux-3.0.3/scripts/Makefile.host
  # Remove .so files from "xxx-objs"
  host-cobjs	:= $(filter-out %.so,$(host-cobjs))
  
-diff -urNp linux-3.0.3/scripts/mod/file2alias.c linux-3.0.3/scripts/mod/file2alias.c
---- linux-3.0.3/scripts/mod/file2alias.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/file2alias.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2alias.c
+--- linux-3.0.4/scripts/mod/file2alias.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/file2alias.c	2011-08-23 21:47:56.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -68236,9 +70997,9 @@ diff -urNp linux-3.0.3/scripts/mod/file2alias.c linux-3.0.3/scripts/mod/file2ali
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-3.0.3/scripts/mod/modpost.c linux-3.0.3/scripts/mod/modpost.c
---- linux-3.0.3/scripts/mod/modpost.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/modpost.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
+--- linux-3.0.4/scripts/mod/modpost.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/modpost.c	2011-08-23 21:47:56.000000000 -0400
 @@ -892,6 +892,7 @@ enum mismatch {
  	ANY_INIT_TO_ANY_EXIT,
  	ANY_EXIT_TO_ANY_INIT,
@@ -68315,9 +71076,9 @@ diff -urNp linux-3.0.3/scripts/mod/modpost.c linux-3.0.3/scripts/mod/modpost.c
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-3.0.3/scripts/mod/modpost.h linux-3.0.3/scripts/mod/modpost.h
---- linux-3.0.3/scripts/mod/modpost.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/modpost.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/modpost.h linux-3.0.4/scripts/mod/modpost.h
+--- linux-3.0.4/scripts/mod/modpost.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/modpost.h	2011-08-23 21:47:56.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -68337,9 +71098,9 @@ diff -urNp linux-3.0.3/scripts/mod/modpost.h linux-3.0.3/scripts/mod/modpost.h
  
  struct module {
  	struct module *next;
-diff -urNp linux-3.0.3/scripts/mod/sumversion.c linux-3.0.3/scripts/mod/sumversion.c
---- linux-3.0.3/scripts/mod/sumversion.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/sumversion.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/sumversion.c linux-3.0.4/scripts/mod/sumversion.c
+--- linux-3.0.4/scripts/mod/sumversion.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/sumversion.c	2011-08-23 21:47:56.000000000 -0400
 @@ -470,7 +470,7 @@ static void write_version(const char *fi
  		goto out;
  	}
@@ -68349,9 +71110,9 @@ diff -urNp linux-3.0.3/scripts/mod/sumversion.c linux-3.0.3/scripts/mod/sumversi
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-3.0.3/scripts/pnmtologo.c linux-3.0.3/scripts/pnmtologo.c
---- linux-3.0.3/scripts/pnmtologo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/pnmtologo.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/pnmtologo.c linux-3.0.4/scripts/pnmtologo.c
+--- linux-3.0.4/scripts/pnmtologo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/pnmtologo.c	2011-08-23 21:47:56.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -68378,9 +71139,9 @@ diff -urNp linux-3.0.3/scripts/pnmtologo.c linux-3.0.3/scripts/pnmtologo.c
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-3.0.3/security/apparmor/lsm.c linux-3.0.3/security/apparmor/lsm.c
---- linux-3.0.3/security/apparmor/lsm.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/security/apparmor/lsm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/apparmor/lsm.c linux-3.0.4/security/apparmor/lsm.c
+--- linux-3.0.4/security/apparmor/lsm.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/security/apparmor/lsm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
  	return error;
  }
@@ -68390,9 +71151,9 @@ diff -urNp linux-3.0.3/security/apparmor/lsm.c linux-3.0.3/security/apparmor/lsm
  	.name =				"apparmor",
  
  	.ptrace_access_check =		apparmor_ptrace_access_check,
-diff -urNp linux-3.0.3/security/commoncap.c linux-3.0.3/security/commoncap.c
---- linux-3.0.3/security/commoncap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/commoncap.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/commoncap.c linux-3.0.4/security/commoncap.c
+--- linux-3.0.4/security/commoncap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/commoncap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
@@ -68420,9 +71181,9 @@ diff -urNp linux-3.0.3/security/commoncap.c linux-3.0.3/security/commoncap.c
  	if (cred->uid != 0) {
  		if (bprm->cap_effective)
  			return 1;
-diff -urNp linux-3.0.3/security/integrity/ima/ima_api.c linux-3.0.3/security/integrity/ima/ima_api.c
---- linux-3.0.3/security/integrity/ima/ima_api.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima_api.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima_api.c linux-3.0.4/security/integrity/ima/ima_api.c
+--- linux-3.0.4/security/integrity/ima/ima_api.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima_api.c	2011-08-23 21:47:56.000000000 -0400
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
  	int result;
  
@@ -68432,9 +71193,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima_api.c linux-3.0.3/security/int
  
  	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  	if (!entry) {
-diff -urNp linux-3.0.3/security/integrity/ima/ima_fs.c linux-3.0.3/security/integrity/ima/ima_fs.c
---- linux-3.0.3/security/integrity/ima/ima_fs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima_fs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima_fs.c linux-3.0.4/security/integrity/ima/ima_fs.c
+--- linux-3.0.4/security/integrity/ima/ima_fs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima_fs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -68450,9 +71211,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima_fs.c linux-3.0.3/security/inte
  	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-3.0.3/security/integrity/ima/ima.h linux-3.0.3/security/integrity/ima/ima.h
---- linux-3.0.3/security/integrity/ima/ima.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima.h linux-3.0.4/security/integrity/ima/ima.h
+--- linux-3.0.4/security/integrity/ima/ima.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima.h	2011-08-23 21:47:56.000000000 -0400
 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -68464,9 +71225,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima.h linux-3.0.3/security/integri
  	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-3.0.3/security/integrity/ima/ima_queue.c linux-3.0.3/security/integrity/ima/ima_queue.c
---- linux-3.0.3/security/integrity/ima/ima_queue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima_queue.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima_queue.c linux-3.0.4/security/integrity/ima/ima_queue.c
+--- linux-3.0.4/security/integrity/ima/ima_queue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima_queue.c	2011-08-23 21:47:56.000000000 -0400
 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
  	INIT_LIST_HEAD(&qe->later);
  	list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -68476,9 +71237,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima_queue.c linux-3.0.3/security/i
  	key = ima_hash_key(entry->digest);
  	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
  	return 0;
-diff -urNp linux-3.0.3/security/Kconfig linux-3.0.3/security/Kconfig
---- linux-3.0.3/security/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
+--- linux-3.0.4/security/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -4,6 +4,554 @@
  
  menu "Security options"
@@ -69043,9 +71804,9 @@ diff -urNp linux-3.0.3/security/Kconfig linux-3.0.3/security/Kconfig
  	default 65536
  	help
  	  This is the portion of low virtual memory which should be protected
-diff -urNp linux-3.0.3/security/keys/keyring.c linux-3.0.3/security/keys/keyring.c
---- linux-3.0.3/security/keys/keyring.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/keys/keyring.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/keys/keyring.c linux-3.0.4/security/keys/keyring.c
+--- linux-3.0.4/security/keys/keyring.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/keys/keyring.c	2011-08-23 21:47:56.000000000 -0400
 @@ -215,15 +215,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
@@ -69065,9 +71826,9 @@ diff -urNp linux-3.0.3/security/keys/keyring.c linux-3.0.3/security/keys/keyring
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-3.0.3/security/min_addr.c linux-3.0.3/security/min_addr.c
---- linux-3.0.3/security/min_addr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/min_addr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/min_addr.c linux-3.0.4/security/min_addr.c
+--- linux-3.0.4/security/min_addr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/min_addr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -69084,9 +71845,9 @@ diff -urNp linux-3.0.3/security/min_addr.c linux-3.0.3/security/min_addr.c
  }
  
  /*
-diff -urNp linux-3.0.3/security/security.c linux-3.0.3/security/security.c
---- linux-3.0.3/security/security.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/security.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/security.c linux-3.0.4/security/security.c
+--- linux-3.0.4/security/security.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/security.c	2011-08-23 21:48:14.000000000 -0400
 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
  /* things that live in capability.c */
  extern void __init security_fixup_ops(struct security_operations *ops);
@@ -69108,9 +71869,9 @@ diff -urNp linux-3.0.3/security/security.c linux-3.0.3/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-3.0.3/security/selinux/hooks.c linux-3.0.3/security/selinux/hooks.c
---- linux-3.0.3/security/selinux/hooks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/selinux/hooks.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hooks.c
+--- linux-3.0.4/security/selinux/hooks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/selinux/hooks.c	2011-08-23 21:48:14.000000000 -0400
 @@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -69128,9 +71889,9 @@ diff -urNp linux-3.0.3/security/selinux/hooks.c linux-3.0.3/security/selinux/hoo
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
-diff -urNp linux-3.0.3/security/selinux/include/xfrm.h linux-3.0.3/security/selinux/include/xfrm.h
---- linux-3.0.3/security/selinux/include/xfrm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/selinux/include/xfrm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/selinux/include/xfrm.h linux-3.0.4/security/selinux/include/xfrm.h
+--- linux-3.0.4/security/selinux/include/xfrm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/selinux/include/xfrm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
@@ -69140,9 +71901,9 @@ diff -urNp linux-3.0.3/security/selinux/include/xfrm.h linux-3.0.3/security/seli
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-3.0.3/security/selinux/ss/services.c linux-3.0.3/security/selinux/ss/services.c
---- linux-3.0.3/security/selinux/ss/services.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/selinux/ss/services.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/selinux/ss/services.c linux-3.0.4/security/selinux/ss/services.c
+--- linux-3.0.4/security/selinux/ss/services.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/selinux/ss/services.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
  	int rc = 0;
  	struct policy_file file = { data, len }, *fp = &file;
@@ -69152,9 +71913,9 @@ diff -urNp linux-3.0.3/security/selinux/ss/services.c linux-3.0.3/security/selin
  	if (!ss_initialized) {
  		avtab_cache_init();
  		rc = policydb_read(&policydb, fp);
-diff -urNp linux-3.0.3/security/smack/smack_lsm.c linux-3.0.3/security/smack/smack_lsm.c
---- linux-3.0.3/security/smack/smack_lsm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/smack/smack_lsm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/smack/smack_lsm.c linux-3.0.4/security/smack/smack_lsm.c
+--- linux-3.0.4/security/smack/smack_lsm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/smack/smack_lsm.c	2011-08-23 21:47:56.000000000 -0400
 @@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
@@ -69164,9 +71925,9 @@ diff -urNp linux-3.0.3/security/smack/smack_lsm.c linux-3.0.3/security/smack/sma
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-3.0.3/security/tomoyo/tomoyo.c linux-3.0.3/security/tomoyo/tomoyo.c
---- linux-3.0.3/security/tomoyo/tomoyo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/tomoyo/tomoyo.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/tomoyo/tomoyo.c linux-3.0.4/security/tomoyo/tomoyo.c
+--- linux-3.0.4/security/tomoyo/tomoyo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/tomoyo/tomoyo.c	2011-08-23 21:47:56.000000000 -0400
 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
@@ -69176,9 +71937,9 @@ diff -urNp linux-3.0.3/security/tomoyo/tomoyo.c linux-3.0.3/security/tomoyo/tomo
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.c linux-3.0.3/sound/aoa/codecs/onyx.c
---- linux-3.0.3/sound/aoa/codecs/onyx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/aoa/codecs/onyx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.c linux-3.0.4/sound/aoa/codecs/onyx.c
+--- linux-3.0.4/sound/aoa/codecs/onyx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/aoa/codecs/onyx.c	2011-08-23 21:47:56.000000000 -0400
 @@ -54,7 +54,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -69207,9 +71968,9 @@ diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.c linux-3.0.3/sound/aoa/codecs/onyx
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.h linux-3.0.3/sound/aoa/codecs/onyx.h
---- linux-3.0.3/sound/aoa/codecs/onyx.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/aoa/codecs/onyx.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.h linux-3.0.4/sound/aoa/codecs/onyx.h
+--- linux-3.0.4/sound/aoa/codecs/onyx.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/aoa/codecs/onyx.h	2011-08-23 21:47:56.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -69218,9 +71979,9 @@ diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.h linux-3.0.3/sound/aoa/codecs/onyx
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-3.0.3/sound/core/seq/seq_device.c linux-3.0.3/sound/core/seq/seq_device.c
---- linux-3.0.3/sound/core/seq/seq_device.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/core/seq/seq_device.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/core/seq/seq_device.c linux-3.0.4/sound/core/seq/seq_device.c
+--- linux-3.0.4/sound/core/seq/seq_device.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/core/seq/seq_device.c	2011-08-23 21:47:56.000000000 -0400
 @@ -63,7 +63,7 @@ struct ops_list {
  	int argsize;		/* argument size */
  
@@ -69257,9 +72018,9 @@ diff -urNp linux-3.0.3/sound/core/seq/seq_device.c linux-3.0.3/sound/core/seq/se
  		dev->status = SNDRV_SEQ_DEVICE_FREE;
  		dev->driver_data = NULL;
  		ops->num_init_devices--;
-diff -urNp linux-3.0.3/sound/drivers/mts64.c linux-3.0.3/sound/drivers/mts64.c
---- linux-3.0.3/sound/drivers/mts64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/drivers/mts64.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/drivers/mts64.c linux-3.0.4/sound/drivers/mts64.c
+--- linux-3.0.4/sound/drivers/mts64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/drivers/mts64.c	2011-08-23 21:47:56.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -69316,9 +72077,9 @@ diff -urNp linux-3.0.3/sound/drivers/mts64.c linux-3.0.3/sound/drivers/mts64.c
  
  	return 0;
  }
-diff -urNp linux-3.0.3/sound/drivers/opl4/opl4_lib.c linux-3.0.3/sound/drivers/opl4/opl4_lib.c
---- linux-3.0.3/sound/drivers/opl4/opl4_lib.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/drivers/opl4/opl4_lib.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/drivers/opl4/opl4_lib.c linux-3.0.4/sound/drivers/opl4/opl4_lib.c
+--- linux-3.0.4/sound/drivers/opl4/opl4_lib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/drivers/opl4/opl4_lib.c	2011-08-23 21:47:56.000000000 -0400
 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
  MODULE_DESCRIPTION("OPL4 driver");
  MODULE_LICENSE("GPL");
@@ -69328,9 +72089,9 @@ diff -urNp linux-3.0.3/sound/drivers/opl4/opl4_lib.c linux-3.0.3/sound/drivers/o
  {
  	int timeout = 10;
  	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-3.0.3/sound/drivers/portman2x4.c linux-3.0.3/sound/drivers/portman2x4.c
---- linux-3.0.3/sound/drivers/portman2x4.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/drivers/portman2x4.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/drivers/portman2x4.c linux-3.0.4/sound/drivers/portman2x4.c
+--- linux-3.0.4/sound/drivers/portman2x4.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/drivers/portman2x4.c	2011-08-23 21:47:56.000000000 -0400
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -69348,9 +72109,9 @@ diff -urNp linux-3.0.3/sound/drivers/portman2x4.c linux-3.0.3/sound/drivers/port
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-3.0.3/sound/firewire/amdtp.c linux-3.0.3/sound/firewire/amdtp.c
---- linux-3.0.3/sound/firewire/amdtp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/firewire/amdtp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/firewire/amdtp.c linux-3.0.4/sound/firewire/amdtp.c
+--- linux-3.0.4/sound/firewire/amdtp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/firewire/amdtp.c	2011-08-23 21:47:56.000000000 -0400
 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
  		ptr = s->pcm_buffer_pointer + data_blocks;
  		if (ptr >= pcm->runtime->buffer_size)
@@ -69369,9 +72130,9 @@ diff -urNp linux-3.0.3/sound/firewire/amdtp.c linux-3.0.3/sound/firewire/amdtp.c
  		(fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
  }
  EXPORT_SYMBOL(amdtp_out_stream_update);
-diff -urNp linux-3.0.3/sound/firewire/amdtp.h linux-3.0.3/sound/firewire/amdtp.h
---- linux-3.0.3/sound/firewire/amdtp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/firewire/amdtp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/firewire/amdtp.h linux-3.0.4/sound/firewire/amdtp.h
+--- linux-3.0.4/sound/firewire/amdtp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/firewire/amdtp.h	2011-08-23 21:47:56.000000000 -0400
 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
  static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
  						struct snd_pcm_substream *pcm)
@@ -69381,9 +72142,9 @@ diff -urNp linux-3.0.3/sound/firewire/amdtp.h linux-3.0.3/sound/firewire/amdtp.h
  }
  
  /**
-diff -urNp linux-3.0.3/sound/firewire/isight.c linux-3.0.3/sound/firewire/isight.c
---- linux-3.0.3/sound/firewire/isight.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/firewire/isight.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/firewire/isight.c linux-3.0.4/sound/firewire/isight.c
+--- linux-3.0.4/sound/firewire/isight.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/firewire/isight.c	2011-08-23 21:47:56.000000000 -0400
 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc
  	ptr += count;
  	if (ptr >= runtime->buffer_size)
@@ -69424,9 +72185,9 @@ diff -urNp linux-3.0.3/sound/firewire/isight.c linux-3.0.3/sound/firewire/isight
  		break;
  	default:
  		return -EINVAL;
-diff -urNp linux-3.0.3/sound/isa/cmi8330.c linux-3.0.3/sound/isa/cmi8330.c
---- linux-3.0.3/sound/isa/cmi8330.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/isa/cmi8330.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/isa/cmi8330.c linux-3.0.4/sound/isa/cmi8330.c
+--- linux-3.0.4/sound/isa/cmi8330.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/isa/cmi8330.c	2011-08-23 21:47:56.000000000 -0400
 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
  
  	struct snd_pcm *pcm;
@@ -69436,9 +72197,9 @@ diff -urNp linux-3.0.3/sound/isa/cmi8330.c linux-3.0.3/sound/isa/cmi8330.c
  		snd_pcm_open_callback_t open;
  		void *private_data; /* sb or wss */
  	} streams[2];
-diff -urNp linux-3.0.3/sound/oss/sb_audio.c linux-3.0.3/sound/oss/sb_audio.c
---- linux-3.0.3/sound/oss/sb_audio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/oss/sb_audio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/oss/sb_audio.c linux-3.0.4/sound/oss/sb_audio.c
+--- linux-3.0.4/sound/oss/sb_audio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/oss/sb_audio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -69448,9 +72209,9 @@ diff -urNp linux-3.0.3/sound/oss/sb_audio.c linux-3.0.3/sound/oss/sb_audio.c
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-3.0.3/sound/oss/swarm_cs4297a.c linux-3.0.3/sound/oss/swarm_cs4297a.c
---- linux-3.0.3/sound/oss/swarm_cs4297a.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/oss/swarm_cs4297a.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/oss/swarm_cs4297a.c linux-3.0.4/sound/oss/swarm_cs4297a.c
+--- linux-3.0.4/sound/oss/swarm_cs4297a.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/oss/swarm_cs4297a.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -69485,9 +72246,9 @@ diff -urNp linux-3.0.3/sound/oss/swarm_cs4297a.c linux-3.0.3/sound/oss/swarm_cs4
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-3.0.3/sound/pci/hda/hda_codec.h linux-3.0.3/sound/pci/hda/hda_codec.h
---- linux-3.0.3/sound/pci/hda/hda_codec.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/pci/hda/hda_codec.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/pci/hda/hda_codec.h linux-3.0.4/sound/pci/hda/hda_codec.h
+--- linux-3.0.4/sound/pci/hda/hda_codec.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/pci/hda/hda_codec.h	2011-08-23 21:47:56.000000000 -0400
 @@ -615,7 +615,7 @@ struct hda_bus_ops {
  	/* notify power-up/down from codec to controller */
  	void (*pm_notify)(struct hda_bus *bus);
@@ -69523,9 +72284,9 @@ diff -urNp linux-3.0.3/sound/pci/hda/hda_codec.h linux-3.0.3/sound/pci/hda/hda_c
  
  	/* PCM to create, set by patch_ops.build_pcms callback */
  	unsigned int num_pcms;
-diff -urNp linux-3.0.3/sound/pci/ice1712/ice1712.h linux-3.0.3/sound/pci/ice1712/ice1712.h
---- linux-3.0.3/sound/pci/ice1712/ice1712.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/pci/ice1712/ice1712.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/pci/ice1712/ice1712.h linux-3.0.4/sound/pci/ice1712/ice1712.h
+--- linux-3.0.4/sound/pci/ice1712/ice1712.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/pci/ice1712/ice1712.h	2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
  	unsigned int mask_flags;	/* total mask bits */
  	struct snd_akm4xxx_ops {
@@ -69544,9 +72305,9 @@ diff -urNp linux-3.0.3/sound/pci/ice1712/ice1712.h linux-3.0.3/sound/pci/ice1712
  };
  
  
-diff -urNp linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c
---- linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c	2011-08-23 21:47:56.000000000 -0400
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
  		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
  			break;
@@ -69587,9 +72348,9 @@ diff -urNp linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c linux-3.0.3/sound/pci/ymfp
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff -urNp linux-3.0.3/sound/soc/soc-core.c linux-3.0.3/sound/soc/soc-core.c
---- linux-3.0.3/sound/soc/soc-core.c	2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/sound/soc/soc-core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/soc/soc-core.c linux-3.0.4/sound/soc/soc-core.c
+--- linux-3.0.4/sound/soc/soc-core.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/sound/soc/soc-core.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
  }
  
@@ -69607,9 +72368,9 @@ diff -urNp linux-3.0.3/sound/soc/soc-core.c linux-3.0.3/sound/soc/soc-core.c
  		soc_pcm_ops.mmap = platform->driver->ops->mmap;
  		soc_pcm_ops.pointer = platform->driver->ops->pointer;
  		soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
-diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h
---- linux-3.0.3/sound/usb/card.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/usb/card.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
+--- linux-3.0.4/sound/usb/card.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/usb/card.h	2011-08-23 21:47:56.000000000 -0400
 @@ -44,6 +44,7 @@ struct snd_urb_ops {
  	int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
  	int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
@@ -69627,19 +72388,23 @@ diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h
  };
  
  struct snd_usb_stream {
-diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constify_plugin.c
---- linux-3.0.3/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/constify_plugin.c	2011-08-27 07:43:46.000000000 -0400
-@@ -0,0 +1,289 @@
+diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constify_plugin.c
+--- linux-3.0.4/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/tools/gcc/constify_plugin.c	2011-08-30 18:23:52.000000000 -0400
+@@ -0,0 +1,293 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
++ * Copyright 2011 by PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2, or (at your option) v3
 + *
-+ * This gcc plugin constifies all structures which contain only function pointers and const fields.
++ * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
++ *
++ * Homepage:
++ * http://www.grsecurity.net/~ephox/const_plugin/
 + *
 + * Usage:
 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
-+ * $ gcc -fplugin=constify_plugin.so test.c  -O2
++ * $ gcc -fplugin=constify_plugin.so test.c -O2
 + */
 +
 +#include "gcc-plugin.h"
@@ -69655,7 +72420,7 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +#include "function.h"
 +#include "tree-flow.h"
 +#include "plugin.h"
-+#include "diagnostic-core.h"
++#include "diagnostic.h"
 +//#include "c-tree.h"
 +
 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
@@ -69920,9 +72685,9 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.3/tools/gcc/Makefile linux-3.0.3/tools/gcc/Makefile
---- linux-3.0.3/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/Makefile	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/tools/gcc/Makefile linux-3.0.4/tools/gcc/Makefile
+--- linux-3.0.4/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/tools/gcc/Makefile	2011-08-23 21:47:56.000000000 -0400
 @@ -0,0 +1,12 @@
 +#CC := gcc
 +#PLUGIN_SOURCE_FILES := pax_plugin.c
@@ -69936,9 +72701,9 @@ diff -urNp linux-3.0.3/tools/gcc/Makefile linux-3.0.3/tools/gcc/Makefile
 +always := $(hostlibs-y)
 +stackleak_plugin-objs := stackleak_plugin.o
 +constify_plugin-objs := constify_plugin.o
-diff -urNp linux-3.0.3/tools/gcc/stackleak_plugin.c linux-3.0.3/tools/gcc/stackleak_plugin.c
---- linux-3.0.3/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/stackleak_plugin.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackleak_plugin.c
+--- linux-3.0.4/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/tools/gcc/stackleak_plugin.c	2011-08-23 21:47:56.000000000 -0400
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -70183,9 +72948,9 @@ diff -urNp linux-3.0.3/tools/gcc/stackleak_plugin.c linux-3.0.3/tools/gcc/stackl
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.3/usr/gen_init_cpio.c linux-3.0.3/usr/gen_init_cpio.c
---- linux-3.0.3/usr/gen_init_cpio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/usr/gen_init_cpio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/usr/gen_init_cpio.c linux-3.0.4/usr/gen_init_cpio.c
+--- linux-3.0.4/usr/gen_init_cpio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/usr/gen_init_cpio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
@@ -70208,9 +72973,9 @@ diff -urNp linux-3.0.3/usr/gen_init_cpio.c linux-3.0.3/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-3.0.3/virt/kvm/kvm_main.c linux-3.0.3/virt/kvm/kvm_main.c
---- linux-3.0.3/virt/kvm/kvm_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/virt/kvm/kvm_main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
+--- linux-3.0.4/virt/kvm/kvm_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/virt/kvm/kvm_main.c	2011-08-23 21:47:56.000000000 -0400
 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;