target/linux: refresh 2.6.32 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21566 3c298f89-4303-0410-b956-a3cf2f4a3e73

42 files changed, 142 insertions, 171 deletions

diff --git a/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch
index a44ebd5b9..ab6d22154 100644
--- a/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.32/101-cfi_fixup_macronix_bootloc.patch
@@ -55,7 +55,7 @@
  static struct cfi_fixup cfi_fixup_table[] = {
  	{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
  #ifdef AMD_BOOTLOC_BUG
-@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] =
+@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] = 
  	 */
  	{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
  	{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
diff --git a/target/linux/adm5120/patches-2.6.32/200-amba_pl010_hacks.patch b/target/linux/adm5120/patches-2.6.32/200-amba_pl010_hacks.patch
index 5f32fa2dd..41c88a948 100644
--- a/target/linux/adm5120/patches-2.6.32/200-amba_pl010_hacks.patch
+++ b/target/linux/adm5120/patches-2.6.32/200-amba_pl010_hacks.patch
@@ -267,7 +267,7 @@
  }
  
  static void
-@@ -565,8 +564,8 @@ pl010_console_write(struct console *co,
+@@ -565,8 +564,8 @@ pl010_console_write(struct console *co, 
  	/*
  	 *	First save the CR then disable the interrupts
  	 */
@@ -278,7 +278,7 @@
  
  	uart_console_write(&uap->port, s, count, pl010_console_putchar);
  
-@@ -575,10 +574,10 @@ pl010_console_write(struct console *co,
+@@ -575,10 +574,10 @@ pl010_console_write(struct console *co, 
  	 *	and restore the TCR
  	 */
  	do {
diff --git a/target/linux/adm5120/patches-2.6.32/903-adm5120-usb-use-the-admhcd-structure-directly-in-debugfs-files.patch b/target/linux/adm5120/patches-2.6.32/903-adm5120-usb-use-the-admhcd-structure-directly-in-debugfs-files.patch
index aa50f8c48..db6323d02 100644
--- a/target/linux/adm5120/patches-2.6.32/903-adm5120-usb-use-the-admhcd-structure-directly-in-debugfs-files.patch
+++ b/target/linux/adm5120/patches-2.6.32/903-adm5120-usb-use-the-admhcd-structure-directly-in-debugfs-files.patch
@@ -26,7 +26,7 @@
  
  	spin_lock_irqsave(&ahcd->lock, flags);
  	temp = show_list(ahcd, buf->page, PAGE_SIZE, ahcd->ed_head);
-@@ -516,8 +512,6 @@ static ssize_t fill_async_buffer(struct
+@@ -516,8 +512,6 @@ static ssize_t fill_async_buffer(struct 
  
  static ssize_t fill_periodic_buffer(struct debug_buffer *buf)
  {
diff --git a/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch b/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
index 12c9483d7..3353c21fb 100644
--- a/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
+++ b/target/linux/ar7/patches-2.6.32/140-uart_port_ar7.patch
@@ -6,11 +6,9 @@
 
     Signed-off-by: Florian Fainelli <florian@openwrt.org>
 
-Index: linux-2.6.32.12/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.12.orig/arch/mips/ar7/platform.c	2010-05-15 18:01:11.000000000 +0200
-+++ linux-2.6.32.12/arch/mips/ar7/platform.c	2010-05-15 18:02:44.000000000 +0200
-@@ -509,7 +509,7 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -509,7 +509,7 @@ static int __init ar7_register_devices(v
  
  	memset(uart_port, 0, sizeof(struct uart_port) * 2);
  
@@ -19,7 +17,7 @@ Index: linux-2.6.32.12/arch/mips/ar7/platform.c
  	uart_port[0].line = 0;
  	uart_port[0].irq = AR7_IRQ_UART0;
  	uart_port[0].uartclk = ar7_bus_freq() / 2;
-@@ -524,7 +524,7 @@
+@@ -524,7 +524,7 @@ static int __init ar7_register_devices(v
  
  	/* Only TNETD73xx have a second serial port */
  	if (ar7_has_second_uart()) {
diff --git a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
index 454f8ca74..484ce2d19 100644
--- a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
+++ b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ar7/platform.c
 +++ b/arch/mips/ar7/platform.c
-@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[]
+@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] 
  	},
  };
  
@@ -37,7 +37,7 @@
  static struct resource vlynq_low_res[] = {
  	{
  		.name = "regs",
-@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[]
+@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] 
  	},
  };
  
@@ -192,7 +192,7 @@
  
  static struct gpio_led default_leds[] = {
  	{
-@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] =
+@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = 
  	},
  };
  
diff --git a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
index 34174db6a..884d46d48 100644
--- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
+++ b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
@@ -45,7 +45,7 @@
  
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
+@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct 
  		goto fail;
  	}
  
diff --git a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
index 005822075..102b82974 100644
--- a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
+++ b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct
+@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct 
  	}
  
  	if (phy_id == PHY_MAX_ADDR) {
diff --git a/target/linux/ar71xx/patches-2.6.32/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.32/003-ar71xx_usb_host.patch
index 0a428c78f..19cea296a 100644
--- a/target/linux/ar71xx/patches-2.6.32/003-ar71xx_usb_host.patch
+++ b/target/linux/ar71xx/patches-2.6.32/003-ar71xx_usb_host.patch
@@ -30,7 +30,7 @@
  	depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL");
+@@ -1142,6 +1142,11 @@ MODULE_LICENSE ("GPL");
  #define	PLATFORM_DRIVER		ehci_atmel_driver
  #endif
  
diff --git a/target/linux/ar71xx/patches-2.6.32/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.32/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
index 18994d083..9b1bd401a 100644
--- a/target/linux/ar71xx/patches-2.6.32/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ b/target/linux/ar71xx/patches-2.6.32/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
@@ -12,7 +12,7 @@
  /* makes sure the async qh will become idle */
 --- a/drivers/usb/host/ehci.h
 +++ b/drivers/usb/host/ehci.h
-@@ -129,6 +129,7 @@ struct ehci_hcd {			/* one per controlle
+@@ -130,6 +130,7 @@ struct ehci_hcd {			/* one per controlle
  	unsigned		has_amcc_usb23:1;
  	unsigned		need_io_watchdog:1;
  	unsigned		broken_periodic:1;
diff --git a/target/linux/atheros/patches-2.6.32/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.32/200-ar2313_enable_mvswitch.patch
index 60025e43e..b97a62d81 100644
--- a/target/linux/atheros/patches-2.6.32/200-ar2313_enable_mvswitch.patch
+++ b/target/linux/atheros/patches-2.6.32/200-ar2313_enable_mvswitch.patch
@@ -48,7 +48,7 @@
  				/* reset descriptor's curr_addr */
  				rxdesc->addr = virt_to_phys(skb_new->data);
  
-@@ -1239,6 +1245,8 @@ static int ar231x_mdiobus_probe (struct
+@@ -1239,6 +1245,8 @@ static int ar231x_mdiobus_probe (struct 
  		return PTR_ERR(phydev);
  	}
  
diff --git a/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch
index 8736dc7d6..a3f25dc8f 100644
--- a/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch
@@ -164,7 +164,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
 +MODULE_ALIAS("platform:bcm63xx_ehci");
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL");
+@@ -1142,6 +1142,11 @@ MODULE_LICENSE ("GPL");
  #define	PLATFORM_DRIVER		ehci_atmel_driver
  #endif
  
diff --git a/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch
index b223589db..5262b186d 100644
--- a/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch
@@ -11,7 +11,7 @@
  static struct gpio_led_platform_data bcm63xx_led_data;
  
  static struct platform_device bcm63xx_gpio_leds = {
-@@ -853,6 +857,8 @@ int __init board_register_devices(void)
+@@ -854,6 +858,8 @@ int __init board_register_devices(void)
  
  	platform_device_register(&mtd_dev);
  
diff --git a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
index b4d948afb..2288baafa 100644
--- a/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch
@@ -79,4 +79,4 @@
 +	struct gpio_led leds[8];
  
  	/* Buttons */
- 	struct gpio_button buttons[1];
+ 	struct gpio_button buttons[2];
diff --git a/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch
index 539d8d475..20b45355f 100644
--- a/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch
@@ -16,7 +16,7 @@
  };
  
  static struct board_info __initdata board_rta1025w_16 = {
-@@ -949,6 +951,9 @@ int __init board_register_devices(void)
+@@ -950,6 +952,9 @@ int __init board_register_devices(void)
  	if (board.has_dsp)
  		bcm63xx_dsp_register(&board.dsp);
  
diff --git a/target/linux/brcm63xx/patches-2.6.32/240-spi.patch b/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
index 319d21cd1..a891ca389 100644
--- a/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/240-spi.patch
@@ -937,7 +937,7 @@
  obj-y		+= boards/
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -29,6 +29,7 @@
+@@ -30,6 +30,7 @@
  #include <bcm63xx_dev_usb_ohci.h>
  #include <bcm63xx_dev_usb_ehci.h>
  #include <bcm63xx_dev_usb_udc.h>
@@ -945,7 +945,7 @@
  #include <board_bcm963xx.h>
  
  #define PFX	"board_bcm963xx: "
-@@ -998,6 +999,9 @@ int __init board_register_devices(void)
+@@ -1495,6 +1496,9 @@ int __init board_register_devices(void)
  	if (board.has_udc0)
  		bcm63xx_udc_register();
  
diff --git a/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch
index 3c1afaefa..0c9cd7622 100644
--- a/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/250-6358-enet1-external-mii-clk.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1308,6 +1308,8 @@ void __init board_prom_init(void)
+@@ -1338,6 +1338,8 @@ void __init board_prom_init(void)
  		if (BCMCPU_IS_6348())
  			val |= GPIO_MODE_6348_G3_EXT_MII |
  				GPIO_MODE_6348_G0_EXT_MII;
diff --git a/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch
index 28eb78ce8..9cc300621 100644
--- a/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/260-no_ehci_over_current_check.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.12/drivers/usb/host/ehci-hub.c
-===================================================================
---- linux-2.6.32.12.orig/drivers/usb/host/ehci-hub.c	2010-05-02 21:06:45.000000000 +0200
-+++ linux-2.6.32.12/drivers/usb/host/ehci-hub.c	2010-05-02 21:07:08.000000000 +0200
-@@ -741,11 +741,13 @@
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -741,11 +741,13 @@ static int ehci_hub_control (
  			 * power switching; they're allowed to just limit the
  			 * current.  khubd will turn the power back on.
  			 */
diff --git a/target/linux/gemini/patches/001-git_sync.patch b/target/linux/gemini/patches/001-git_sync.patch
index 5d48cf0e6..d072a0195 100644
--- a/target/linux/gemini/patches/001-git_sync.patch
+++ b/target/linux/gemini/patches/001-git_sync.patch
@@ -26,7 +26,7 @@
  1:		mcr	p15, 0, r0, c1, c0, 0	@ load control register
  		mrc	p15, 0, r0, c1, c0, 0	@ and read it back to
  		sub	pc, lr, r0, lsr #32	@ properly flush pipeline
-@@ -539,7 +540,7 @@ __common_mmu_cache_on:
+@@ -538,7 +539,7 @@ __common_mmu_cache_on:
   * r8     = atags pointer
   * r9-r12,r14 = corrupted
   */
@@ -35,8 +35,8 @@
  reloc_start:	add	r9, r5, r0
  		sub	r9, r9, #128		@ do not copy the stack
  		debug_reloc_start
-@@ -768,7 +769,7 @@ proc_types:
-  * On exit,   r0, r1, r2, r3, r12 corrupted
+@@ -766,7 +767,7 @@ proc_types:
+  * On exit, r0, r1, r2, r3, r9, r12 corrupted
   * This routine must preserve: r4, r6, r7
   */
 -		.align	5
@@ -44,7 +44,7 @@
  cache_off:	mov	r3, #12			@ cache_off function
  		b	call_cache_fn
  
-@@ -845,7 +846,7 @@ __armv3_mmu_cache_off:
+@@ -841,7 +842,7 @@ __armv3_mmu_cache_off:
   * This routine must preserve:
   *  r0, r4, r5, r6, r7
   */
@@ -4640,7 +4640,7 @@
  }
  
  /* ehci_shutdown kick in for silicon on any bus (not just pci, etc).
-@@ -653,7 +656,9 @@ static int ehci_run (struct usb_hcd *hcd
+@@ -654,7 +657,9 @@ static int ehci_run (struct usb_hcd *hcd
  	// Philips, Intel, and maybe others need CMD_RUN before the
  	// root hub will detect new devices (why?); NEC doesn't
  	ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
@@ -4650,7 +4650,7 @@
  	ehci_writel(ehci, ehci->command, &ehci->regs->command);
  	dbg_cmd (ehci, "init", ehci->command);
  
-@@ -673,9 +678,11 @@ static int ehci_run (struct usb_hcd *hcd
+@@ -674,9 +679,11 @@ static int ehci_run (struct usb_hcd *hcd
  	 */
  	down_write(&ehci_cf_port_reset_rwsem);
  	hcd->state = HC_STATE_RUNNING;
@@ -4662,7 +4662,7 @@
  	up_write(&ehci_cf_port_reset_rwsem);
  	ehci->last_periodic_enable = ktime_get_real();
  
-@@ -767,9 +774,10 @@ static irqreturn_t ehci_irq (struct usb_
+@@ -768,9 +775,10 @@ static irqreturn_t ehci_irq (struct usb_
  		pcd_status = status;
  
  		/* resume root hub? */
@@ -4674,7 +4674,7 @@
  		while (i--) {
  			int pstatus = ehci_readl(ehci,
  						 &ehci->regs->port_status [i]);
-@@ -802,7 +810,9 @@ static irqreturn_t ehci_irq (struct usb_
+@@ -803,7 +811,9 @@ static irqreturn_t ehci_irq (struct usb_
  		ehci_halt(ehci);
  dead:
  		ehci_reset(ehci);
@@ -4684,7 +4684,7 @@
  		/* generic layer kills/unlinks all urbs, then
  		 * uses ehci_stop to clean up the rest
  		 */
-@@ -1101,6 +1111,11 @@ MODULE_LICENSE ("GPL");
+@@ -1102,6 +1112,11 @@ MODULE_LICENSE ("GPL");
  #define	PCI_DRIVER		ehci_pci_driver
  #endif
  
diff --git a/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash b/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash
index e2a456915..1faeb41ea 100644
--- a/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash
+++ b/target/linux/generic-2.6/patches-2.6.32/014-samsung_flash
@@ -8,7 +8,7 @@
  
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct 
  
  		if (extp->MajorVersion != '1' ||
  		    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
diff --git a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
index 5b99b3fd1..dd9bb57c3 100644
--- a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
@@ -157,7 +157,7 @@
  
  unsigned int vced_count, vcei_count;
  
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
  	/*
  	 * For the first processor also print the system type
  	 */
diff --git a/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
index 4d1072cd4..eab03db50 100644
--- a/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct 
  
  		cfi_fixup_major_minor(cfi, extp);
  
diff --git a/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch b/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch
index de9c63c35..be7d97fe1 100644
--- a/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/100-netfilter_layer7_2.21.patch
@@ -71,7 +71,7 @@
  	depends on NETFILTER_ADVANCED
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
+@@ -89,6 +89,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) 
  obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch
index f6e70d59d..9540ce0dd 100644
--- a/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/150-netfilter_imq.patch
@@ -958,7 +958,7 @@
  			dev_queue_xmit_nit(skb, dev);
  
  		if (netif_needs_gso(dev, skb)) {
-@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device
+@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device 
  }
  EXPORT_SYMBOL(skb_tx_hash);
  
@@ -1183,7 +1183,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  
diff --git a/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch b/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch
index e4324717b..6ea9ba51e 100644
--- a/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/202-mips_mem_functions_performance.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/string.h
 +++ b/arch/mips/include/asm/string.h
-@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__
+@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ 
  
  #define __HAVE_ARCH_MEMSET
  extern void *memset(void *__s, int __c, size_t __count);
diff --git a/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch b/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch
index 5bbf9f5f0..0c1ae72a4 100644
--- a/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/203-slab_maxsize.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache
+@@ -124,8 +124,8 @@ int kmem_ptr_validate(struct kmem_cache 
   * to do various tricks to work around compiler limitations in order to
   * ensure proper constant folding.
   */
diff --git a/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch b/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
index b64630d50..d71e3b6fa 100644
--- a/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/210-mini_fo_2.6.25_fixes.patch
@@ -61,7 +61,7 @@
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
  extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
  
-@@ -501,6 +505,29 @@ static inline void double_unlock(struct
+@@ -501,6 +505,29 @@ static inline void double_unlock(struct 
  #endif  /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
  #endif /* __KERNEL__ */
  
@@ -127,7 +127,7 @@
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
 --- a/fs/mini_fo/aux.c
 +++ b/fs/mini_fo/aux.c
-@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
+@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb, 
  	err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
  
  	/* validate */
diff --git a/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch b/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
index b5fa64e6a..8bd9ba324 100644
--- a/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/212-mini_fo_2.6.26_fixes.patch
@@ -1,6 +1,6 @@
 --- a/fs/mini_fo/super.c
 +++ b/fs/mini_fo/super.c
-@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int
+@@ -84,6 +84,7 @@ mini_fo_write_inode(inode_t *inode, int 
  #endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
  
  
diff --git a/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch b/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch
index 4edb071ad..1892eb5bd 100644
--- a/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/400-ledtrig_morse.patch
@@ -11,7 +11,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+=
+@@ -40,3 +40,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= 
  obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
  obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch b/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch
index 4565740ca..d6f7353dc 100644
--- a/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/402-ledtrig_netdev.patch
@@ -14,7 +14,7 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+=
+@@ -41,3 +41,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= 
  obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
  obj-$(CONFIG_LEDS_TRIGGER_MORSE)	+= ledtrig-morse.o
diff --git a/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch b/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
index c40da10d6..5c70e79a0 100644
--- a/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/511-yaffs-cvs-2009-04-24.patch
@@ -601,7 +601,7 @@
  			dev->checkpointBlockList[i] = -1;
  	}
  
-@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device
+@@ -191,18 +185,17 @@ int yaffs_GetCheckpointSum(yaffs_Device 
  
  static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
  {
@@ -926,7 +926,7 @@
  {
  	unsigned char cDelta;	/* column parity delta */
  	unsigned lDelta;	/* line parity delta */
-@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -294,8 +292,7 @@ int yaffs_ECCCorrectOther(unsigned char 
  		return 0; /* no error */
  
  	if (lDelta == ~lDeltaPrime &&
@@ -936,7 +936,7 @@
  		/* Single bit (recoverable) error in data */
  
  		bit = 0;
-@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -307,7 +304,7 @@ int yaffs_ECCCorrectOther(unsigned char 
  		if (cDelta & 0x02)
  			bit |= 0x01;
  
@@ -945,7 +945,7 @@
  			return -1;
  
  		data[lDelta] ^= (1 << bit);
-@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -316,7 +313,7 @@ int yaffs_ECCCorrectOther(unsigned char 
  	}
  
  	if ((yaffs_CountBits32(lDelta) + yaffs_CountBits32(lDeltaPrime) +
@@ -954,7 +954,7 @@
  		/* Reccoverable error in ecc */
  
  		*read_ecc = *test_ecc;
-@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char
+@@ -326,6 +323,4 @@ int yaffs_ECCCorrectOther(unsigned char 
  	/* Unrecoverable error */
  
  	return -1;
@@ -1398,7 +1398,7 @@
  {
  	unsigned char *alias;
  	int ret;
-@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry
+@@ -329,7 +395,7 @@ static int yaffs_readlink(struct dentry 
  	return ret;
  }
  
@@ -1560,7 +1560,7 @@
  static int yaffs_file_flush(struct file *file, fl_owner_t id)
  #else
  static int yaffs_file_flush(struct file *file)
-@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file
+@@ -513,8 +579,8 @@ static int yaffs_file_flush(struct file 
  	yaffs_Device *dev = obj->myDev;
  
  	T(YAFFS_TRACE_OS,
@@ -1571,7 +1571,7 @@
  
  	yaffs_GrossLock(dev);
  
-@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct
+@@ -535,15 +601,15 @@ static int yaffs_readpage_nolock(struct 
  
  	yaffs_Device *dev;
  
@@ -1591,7 +1591,7 @@
  	BUG_ON(!PageLocked(pg));
  #else
  	if (!PageLocked(pg))
-@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct
+@@ -555,9 +621,9 @@ static int yaffs_readpage_nolock(struct 
  
  	yaffs_GrossLock(dev);
  
@@ -1604,7 +1604,7 @@
  
  	yaffs_GrossUnlock(dev);
  
-@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct
+@@ -575,7 +641,7 @@ static int yaffs_readpage_nolock(struct 
  	flush_dcache_page(pg);
  	kunmap(pg);
  
@@ -3193,7 +3193,7 @@
  		if (n < step) {
  			n++;
  			continue;
-@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file
+@@ -2119,7 +2356,7 @@ static int yaffs_proc_write(struct file 
  	char *end;
  	char *mask_name;
  	const char *x;
@@ -3202,7 +3202,7 @@
  	int i;
  	int done = 0;
  	int add, len = 0;
-@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file
+@@ -2129,9 +2366,8 @@ static int yaffs_proc_write(struct file 
  
  	while (!done && (pos < count)) {
  		done = 1;
@@ -3213,7 +3213,7 @@
  
  		switch (buf[pos]) {
  		case '+':
-@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file
+@@ -2148,20 +2384,21 @@ static int yaffs_proc_write(struct file 
  		mask_name = NULL;
  
  		mask_bitfield = simple_strtoul(buf + pos, &end, 0);
@@ -3240,7 +3240,7 @@
  					mask_name = mask_flags[i].mask_name;
  					mask_bitfield = mask_flags[i].mask_bitfield;
  					done = 0;
-@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file
+@@ -2172,7 +2409,7 @@ static int yaffs_proc_write(struct file 
  
  		if (mask_name != NULL) {
  			done = 0;
@@ -3249,7 +3249,7 @@
  			case '-':
  				rg &= ~mask_bitfield;
  				break;
-@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file
+@@ -2191,13 +2428,13 @@ static int yaffs_proc_write(struct file 
  
  	yaffs_traceMask = rg | YAFFS_TRACE_ALWAYS;
  
@@ -5691,7 +5691,7 @@
  {
  	/* Get the real object in case we were fed a hard link as an equivalent object */
  	equivalentObject = yaffs_GetEquivalentObject(equivalentObject);
-@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object *
+@@ -2363,33 +2396,31 @@ yaffs_Object *yaffs_Link(yaffs_Object * 
  
  }
  
@@ -7622,7 +7622,7 @@
  	int nToCopy;
  	int n = nBytes;
  	int nDone = 0;
-@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4600,27 +4665,26 @@ int yaffs_ReadDataFromFile(yaffs_Object 
  	dev = in->myDev;
  
  	while (n > 0) {
@@ -7657,7 +7657,7 @@
  			if (dev->nShortOpCaches > 0) {
  
  				/* If we can't find the data in the cache, then load it up. */
-@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4641,14 +4705,9 @@ int yaffs_ReadDataFromFile(yaffs_Object 
  
  				cache->locked = 1;
  
@@ -7673,7 +7673,7 @@
  				cache->locked = 0;
  			} else {
  				/* Read into the local buffer then copy..*/
-@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4657,41 +4716,19 @@ int yaffs_ReadDataFromFile(yaffs_Object 
  				    yaffs_GetTempBuffer(dev, __LINE__);
  				yaffs_ReadChunkDataFromObject(in, chunk,
  							      localBuffer);
@@ -7718,7 +7718,7 @@
  		}
  
  		n -= nToCopy;
-@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object
+@@ -4704,28 +4741,37 @@ int yaffs_ReadDataFromFile(yaffs_Object 
  	return nDone;
  }
  
@@ -7923,7 +7923,7 @@
  	int newFullChunks;
  
  	yaffs_Device *dev = in->myDev;
-@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4955,13 +4981,11 @@ int yaffs_ResizeFile(yaffs_Object * in, 
  
  	yaffs_CheckGarbageCollection(dev);
  
@@ -7941,7 +7941,7 @@
  
  	if (newSize < oldFileSize) {
  
-@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in,
+@@ -4994,21 +5018,20 @@ int yaffs_ResizeFile(yaffs_Object * in, 
  	}
  
  
@@ -7968,7 +7968,7 @@
  {
  	obj = yaffs_GetEquivalentObject(obj);
  
-@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object *
+@@ -5024,7 +5047,7 @@ loff_t yaffs_GetFileSize(yaffs_Object * 
  
  
  
@@ -9789,7 +9789,7 @@
  {
  	int init_failed = 0;
  	unsigned x;
-@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7040,6 +7126,8 @@ int yaffs_GutsInitialise(yaffs_Device * 
  	dev->chunkOffset = 0;
  	dev->nFreeChunks = 0;
  
@@ -9798,7 +9798,7 @@
  	if (dev->startBlock == 0) {
  		dev->internalStartBlock = dev->startBlock + 1;
  		dev->internalEndBlock = dev->endBlock + 1;
-@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7049,18 +7137,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
  	/* Check geometry parameters. */
  
@@ -9823,7 +9823,7 @@
  		return YAFFS_FAIL;
  	}
  
-@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7070,6 +7158,12 @@ int yaffs_GutsInitialise(yaffs_Device * 
  		return YAFFS_FAIL;
  	}
  
@@ -9836,7 +9836,7 @@
  	/* Got the right mix of functions? */
  	if (!yaffs_CheckDevFunctions(dev)) {
  		/* Function missing */
-@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7097,31 +7191,18 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
  	dev->isMounted = 1;
  
@@ -9875,7 +9875,7 @@
  
  	/*
  	 * Calculate chunkGroupBits.
-@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7133,16 +7214,15 @@ int yaffs_GutsInitialise(yaffs_Device * 
  	bits = ShiftsGE(x);
  
  	/* Set up tnode width if wide tnodes are enabled. */
@@ -9896,7 +9896,7 @@
  		dev->tnodeWidth = 16;
  
  	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
-@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7193,7 +7273,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
  	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
  
  	/* Initialise temporary buffers and caches. */
@@ -9905,7 +9905,7 @@
  		init_failed = 1;
  
  	dev->srCache = NULL;
-@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7203,25 +7283,26 @@ int yaffs_GutsInitialise(yaffs_Device * 
  	if (!init_failed &&
  	    dev->nShortOpCaches > 0) {
  		int i;
@@ -9940,7 +9940,7 @@
  			init_failed = 1;
  
  		dev->srLastUse = 0;
-@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7229,29 +7310,30 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
  	dev->cacheHits = 0;
  
@@ -9979,7 +9979,7 @@
  				T(YAFFS_TRACE_ALWAYS,
  				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
  			} else {
-@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7273,24 +7355,25 @@ int yaffs_GutsInitialise(yaffs_Device * 
  				dev->nBackgroundDeletions = 0;
  				dev->oldestDirtySequence = 0;
  
@@ -10011,7 +10011,7 @@
  		/* Clean up the mess */
  		T(YAFFS_TRACE_TRACING,
  		  (TSTR("yaffs: yaffs_GutsInitialise() aborted.\n" TENDSTR)));
-@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device *
+@@ -7318,7 +7401,7 @@ int yaffs_GutsInitialise(yaffs_Device * 
  
  }
  
@@ -10710,7 +10710,7 @@
  {
  	if (etags) {
  		memset(etags, 0, sizeof(*etags));
-@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags *
+@@ -169,9 +169,9 @@ static int rettags(yaffs_ExtendedTags * 
   * Returns YAFFS_OK or YAFFS_FAIL.
   */
  int nandmtd1_ReadChunkWithTagsFromNAND(yaffs_Device *dev,
diff --git a/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch b/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch
index 22a65924d..7552ceb33 100644
--- a/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/903-hostap_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/hostap/hostap_ap.c
 +++ b/drivers/net/wireless/hostap/hostap_ap.c
-@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t
+@@ -2335,13 +2335,13 @@ int prism2_ap_get_sta_qual(local_info_t 
  		addr[count].sa_family = ARPHRD_ETHER;
  		memcpy(addr[count].sa_data, sta->addr, ETH_ALEN);
  		if (sta->last_rx_silence == 0)
diff --git a/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch
index a36ea4993..453affe58 100644
--- a/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/924-cs5535_gpio.patch
@@ -8,7 +8,7 @@
  #include <linux/ioport.h>
  #include <linux/pci.h>
  #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[]
+@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
  MODULE_DEVICE_TABLE(pci, divil_pci);
  
  static struct cdev cs5535_gpio_cdev;
diff --git a/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch b/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch
index 8eff02fa6..0b0c1e279 100644
--- a/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/971-ocf_20100325.patch
@@ -24,7 +24,7 @@
   * All of these routines try to estimate how many bits of randomness a
   * particular randomness source.  They do this by keeping track of the
   * first and second order deltas of the event timings.
-@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk
+@@ -714,6 +724,61 @@ void add_disk_randomness(struct gendisk 
  }
  #endif
  
diff --git a/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch
index f81e22f11..face9154d 100644
--- a/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch
@@ -1,6 +1,6 @@
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
+@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
  
  quiet_cmd_lzma = LZMA    $@
  cmd_lzma = (cat $(filter-out FORCE,$^) | \
diff --git a/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch b/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch
index df7556335..8aed071e3 100644
--- a/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch
+++ b/target/linux/rdc/patches-2.6.32/001-rdc321x_mfd_southbridge.patch
@@ -11,11 +11,9 @@ Changes from v2:
 - removed pci_dev accessors
 - use DEFINE_PCI_DEVICE_TABLE
 
-Index: linux-2.6.32.10/drivers/mfd/Kconfig
-===================================================================
---- linux-2.6.32.10.orig/drivers/mfd/Kconfig	2010-03-15 16:52:04.000000000 +0100
-+++ linux-2.6.32.10/drivers/mfd/Kconfig	2010-05-15 21:48:27.000000000 +0200
-@@ -305,6 +305,15 @@
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -305,6 +305,15 @@ config EZX_PCAP
  	  This enables the PCAP ASIC present on EZX Phones. This is
  	  needed for MMC, TouchScreen, Sound, USB, etc..
  
@@ -31,20 +29,16 @@ Index: linux-2.6.32.10/drivers/mfd/Kconfig
  endmenu
  
  menu "Multimedia Capabilities Port drivers"
-Index: linux-2.6.32.10/drivers/mfd/Makefile
-===================================================================
---- linux-2.6.32.10.orig/drivers/mfd/Makefile	2010-03-15 16:52:04.000000000 +0100
-+++ linux-2.6.32.10/drivers/mfd/Makefile	2010-05-15 21:48:27.000000000 +0200
-@@ -50,3 +50,5 @@
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -50,3 +50,5 @@ obj-$(CONFIG_PCF50633_ADC)	+= pcf50633-a
  obj-$(CONFIG_PCF50633_GPIO)	+= pcf50633-gpio.o
  obj-$(CONFIG_AB3100_CORE)	+= ab3100-core.o
  obj-$(CONFIG_AB3100_OTP)	+= ab3100-otp.o
 +
 +obj-$(CONFIG_MFD_RDC321X)	+= rdc321x-southbridge.o
-Index: linux-2.6.32.10/drivers/mfd/rdc321x-southbridge.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.10/drivers/mfd/rdc321x-southbridge.c	2010-05-15 22:53:39.000000000 +0200
+--- /dev/null
++++ b/drivers/mfd/rdc321x-southbridge.c
 @@ -0,0 +1,123 @@
 +/*
 + * RDC321x MFD southbrige driver
@@ -169,10 +163,8 @@ Index: linux-2.6.32.10/drivers/mfd/rdc321x-southbridge.c
 +MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("RDC R-321x MFD southbridge driver");
-Index: linux-2.6.32.10/include/linux/mfd/rdc321x.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.10/include/linux/mfd/rdc321x.h	2010-05-15 21:48:27.000000000 +0200
+--- /dev/null
++++ b/include/linux/mfd/rdc321x.h
 @@ -0,0 +1,26 @@
 +#ifndef __RDC321X_MFD_H
 +#define __RDC321X_MFD_H
diff --git a/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch b/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
index c2365b7bf..42ad6aa64 100644
--- a/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
+++ b/target/linux/rdc/patches-2.6.32/002-rdc321x_gpio.patch
@@ -8,11 +8,9 @@ Changes from v2:
 - use the pci_dev pointer passed as platform data
 - replaced rdc321x_pci_{read,write}
 
-Index: linux-2.6.32.10/drivers/gpio/Kconfig
-===================================================================
---- linux-2.6.32.10.orig/drivers/gpio/Kconfig	2010-05-15 22:54:31.000000000 +0200
-+++ linux-2.6.32.10/drivers/gpio/Kconfig	2010-05-15 22:54:51.000000000 +0200
-@@ -196,6 +196,14 @@
+--- a/drivers/gpio/Kconfig
++++ b/drivers/gpio/Kconfig
+@@ -196,6 +196,14 @@ config GPIO_LANGWELL
  	help
  	  Say Y here to support Intel Moorestown platform GPIO.
  
@@ -27,19 +25,15 @@ Index: linux-2.6.32.10/drivers/gpio/Kconfig
  comment "SPI GPIO expanders:"
  
  config GPIO_MAX7301
-Index: linux-2.6.32.10/drivers/gpio/Makefile
-===================================================================
---- linux-2.6.32.10.orig/drivers/gpio/Makefile	2010-05-15 22:54:31.000000000 +0200
-+++ linux-2.6.32.10/drivers/gpio/Makefile	2010-05-15 22:54:51.000000000 +0200
-@@ -19,3 +19,4 @@
+--- a/drivers/gpio/Makefile
++++ b/drivers/gpio/Makefile
+@@ -19,3 +19,4 @@ obj-$(CONFIG_GPIO_XILINX)	+= xilinx_gpio
  obj-$(CONFIG_GPIO_BT8XX)	+= bt8xxgpio.o
  obj-$(CONFIG_GPIO_VR41XX)	+= vr41xx_giu.o
  obj-$(CONFIG_GPIO_WM831X)	+= wm831x-gpio.o
 +obj-$(CONFIG_GPIO_RDC321X)	+= rdc321x-gpio.o
-Index: linux-2.6.32.10/drivers/gpio/rdc321x-gpio.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.32.10/drivers/gpio/rdc321x-gpio.c	2010-05-15 22:55:10.000000000 +0200
+--- /dev/null
++++ b/drivers/gpio/rdc321x-gpio.c
 @@ -0,0 +1,245 @@
 +/*
 + * RDC321x GPIO driver
diff --git a/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch b/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch
index dafa7e49a..9bb14534b 100644
--- a/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch
+++ b/target/linux/rdc/patches-2.6.32/003-rdc321x_watchdog_southbridge.patch
@@ -10,10 +10,8 @@ Changes from v2:
 - replaced rdc321x_pci_{read,write}
 - use the pci_dev pointer passed as platform_data
 
-Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
-===================================================================
---- linux-2.6.32.10.orig/drivers/watchdog/rdc321x_wdt.c	2010-05-15 22:14:28.000000000 +0200
-+++ linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c	2010-05-15 22:15:24.000000000 +0200
+--- a/drivers/watchdog/rdc321x_wdt.c
++++ b/drivers/watchdog/rdc321x_wdt.c
 @@ -1,7 +1,7 @@
  /*
   * RDC321x watchdog driver
@@ -33,7 +31,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  
  #define RDC_WDT_MASK	0x80000000 /* Mask */
  #define RDC_WDT_EN	0x00800000 /* Enable bit */
-@@ -63,6 +62,8 @@
+@@ -63,6 +62,8 @@ static struct {
  	int default_ticks;
  	unsigned long inuse;
  	spinlock_t lock;
@@ -42,7 +40,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  } rdc321x_wdt_device;
  
  /* generic helper functions */
-@@ -70,14 +71,18 @@
+@@ -70,14 +71,18 @@ static struct {
  static void rdc321x_wdt_trigger(unsigned long unused)
  {
  	unsigned long flags;
@@ -63,7 +61,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  	spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
  
  	/* requeue?? */
-@@ -105,10 +110,13 @@
+@@ -105,10 +110,13 @@ static void rdc321x_wdt_start(void)
  
  		/* Clear the timer */
  		spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
@@ -79,7 +77,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  		spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
  
  		mod_timer(&rdc321x_wdt_device.timer,
-@@ -148,7 +156,7 @@
+@@ -148,7 +156,7 @@ static long rdc321x_wdt_ioctl(struct fil
  				unsigned long arg)
  {
  	void __user *argp = (void __user *)arg;
@@ -88,7 +86,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  	static struct watchdog_info ident = {
  		.options = WDIOF_CARDRESET,
  		.identity = "RDC321x WDT",
-@@ -162,9 +170,10 @@
+@@ -162,9 +170,10 @@ static long rdc321x_wdt_ioctl(struct fil
  	case WDIOC_GETSTATUS:
  		/* Read the value from the DATA register */
  		spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
@@ -101,7 +99,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  			return -EFAULT;
  		break;
  	case WDIOC_GETSUPPORT:
-@@ -219,17 +228,35 @@
+@@ -219,17 +228,35 @@ static struct miscdevice rdc321x_wdt_mis
  static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
  {
  	int err;
@@ -139,7 +137,7 @@ Index: linux-2.6.32.10/drivers/watchdog/rdc321x_wdt.c
  
  	init_completion(&rdc321x_wdt_device.stop);
  	rdc321x_wdt_device.queue = 0;
-@@ -240,7 +267,7 @@
+@@ -240,7 +267,7 @@ static int __devinit rdc321x_wdt_probe(s
  
  	rdc321x_wdt_device.default_ticks = ticks;
  
diff --git a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
index 0b236df4a..adf59a7bb 100644
--- a/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
+++ b/target/linux/rdc/patches-2.6.32/011-tune_lzma_options.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/scripts/Makefile.lib
-===================================================================
---- linux-2.6.32.9.orig/scripts/Makefile.lib	2010-04-13 07:55:06.543296524 +0200
-+++ linux-2.6.32.9/scripts/Makefile.lib	2010-04-13 07:55:06.814268461 +0200
-@@ -228,7 +228,7 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -228,7 +228,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) 
  
  quiet_cmd_lzma = LZMA    $@
  cmd_lzma = (cat $(filter-out FORCE,$^) | \
@@ -11,10 +9,8 @@ Index: linux-2.6.32.9/scripts/Makefile.lib
  	(rm -f $@ ; false)
  
  quiet_cmd_lzo = LZO    $@
-Index: linux-2.6.32.9/arch/x86/include/asm/boot.h
-===================================================================
---- linux-2.6.32.9.orig/arch/x86/include/asm/boot.h	2010-02-23 16:38:51.000000000 +0100
-+++ linux-2.6.32.9/arch/x86/include/asm/boot.h	2010-04-13 08:00:14.474369306 +0200
+--- a/arch/x86/include/asm/boot.h
++++ b/arch/x86/include/asm/boot.h
 @@ -28,7 +28,7 @@
  #error "Invalid value for CONFIG_PHYSICAL_ALIGN"
  #endif
diff --git a/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch b/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch
index 41be86aa1..f56c40fec 100644
--- a/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch
+++ b/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch
@@ -1,8 +1,6 @@
-diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
-index 4122916..eeee379 100644
 --- a/drivers/net/r6040.c
 +++ b/drivers/net/r6040.c
-@@ -400,9 +400,6 @@ static void r6040_init_mac_regs(struct net_device *dev)
+@@ -401,9 +401,6 @@ static void r6040_init_mac_regs(struct n
  	 * we may got called by r6040_tx_timeout which has left
  	 * some unsent tx buffers */
  	iowrite16(0x01, ioaddr + MTPR);
@@ -12,7 +10,7 @@ index 4122916..eeee379 100644
  }
  
  static void r6040_tx_timeout(struct net_device *dev)
-@@ -530,8 +527,6 @@ static int r6040_phy_mode_chk(struct net_device *dev)
+@@ -531,8 +528,6 @@ static int r6040_phy_mode_chk(struct net
  			phy_dat = 0x0000;
  	}
  
@@ -21,7 +19,7 @@ index 4122916..eeee379 100644
  	return phy_dat;
  };
  
-@@ -813,6 +808,9 @@ static void r6040_timer(unsigned long data)
+@@ -814,6 +809,9 @@ static void r6040_timer(unsigned long da
  
  	/* Timer active again */
  	mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
diff --git a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
index 9a9422877..b3e8c94f0 100644
--- a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
+++ b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.32.12/drivers/net/r6040.c
-===================================================================
---- linux-2.6.32.12.orig/drivers/net/r6040.c	2010-05-20 10:19:41.000000000 +0200
-+++ linux-2.6.32.12/drivers/net/r6040.c	2010-05-20 10:28:48.000000000 +0200
+--- a/drivers/net/r6040.c
++++ b/drivers/net/r6040.c
 @@ -45,6 +45,7 @@
  #include <linux/io.h>
  #include <linux/irq.h>
@@ -10,7 +8,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  
  #include <asm/processor.h>
  
-@@ -180,7 +181,6 @@
+@@ -180,7 +181,6 @@ struct r6040_descriptor {
  
  struct r6040_private {
  	spinlock_t lock;		/* driver lock */
@@ -18,7 +16,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  	struct pci_dev *pdev;
  	struct r6040_descriptor *rx_insert_ptr;
  	struct r6040_descriptor *rx_remove_ptr;
-@@ -190,13 +190,15 @@
+@@ -190,13 +190,15 @@ struct r6040_private {
  	struct r6040_descriptor *tx_ring;
  	dma_addr_t rx_ring_dma;
  	dma_addr_t tx_ring_dma;
@@ -37,7 +35,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  };
  
  static char version[] __devinitdata = KERN_INFO DRV_NAME
-@@ -239,20 +241,29 @@
+@@ -239,20 +241,29 @@ static void r6040_phy_write(void __iomem
  	}
  }
  
@@ -71,7 +69,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  }
  
  static void r6040_free_txbufs(struct net_device *dev)
-@@ -409,10 +420,9 @@
+@@ -409,10 +420,9 @@ static void r6040_tx_timeout(struct net_
  	void __iomem *ioaddr = priv->base;
  
  	printk(KERN_WARNING "%s: transmit timed out, int enable %4.4x "
@@ -84,7 +82,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  
  	dev->stats.tx_errors++;
  
-@@ -464,9 +474,6 @@
+@@ -464,9 +474,6 @@ static int r6040_close(struct net_device
  	struct r6040_private *lp = netdev_priv(dev);
  	struct pci_dev *pdev = lp->pdev;
  
@@ -94,7 +92,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  	spin_lock_irq(&lp->lock);
  	napi_disable(&lp->napi);
  	netif_stop_queue(dev);
-@@ -496,64 +503,14 @@
+@@ -496,64 +503,14 @@ static int r6040_close(struct net_device
  	return 0;
  }
  
@@ -162,7 +160,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  }
  
  static int r6040_rx(struct net_device *dev, int limit)
-@@ -752,26 +709,6 @@
+@@ -752,26 +709,6 @@ static int r6040_up(struct net_device *d
  	if (ret)
  		return ret;
  
@@ -189,7 +187,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  	/* improve performance (by RDC guys) */
  	r6040_phy_write(ioaddr, 30, 17, (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
  	r6040_phy_write(ioaddr, 30, 17, ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
-@@ -784,35 +721,6 @@
+@@ -784,35 +721,6 @@ static int r6040_up(struct net_device *d
  	return 0;
  }
  
@@ -225,7 +223,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  
  /* Read/set MAC address routines */
  static void r6040_mac_address(struct net_device *dev)
-@@ -874,10 +782,6 @@
+@@ -874,10 +782,6 @@ static int r6040_open(struct net_device 
  	napi_enable(&lp->napi);
  	netif_start_queue(dev);
  
@@ -236,7 +234,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  	return 0;
  }
  
-@@ -1020,40 +924,22 @@
+@@ -1020,40 +924,22 @@ static void netdev_get_drvinfo(struct ne
  static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
  	struct r6040_private *rp = netdev_priv(dev);
@@ -280,7 +278,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  };
  
  static const struct net_device_ops r6040_netdev_ops = {
-@@ -1072,6 +958,86 @@
+@@ -1072,6 +958,86 @@ static const struct net_device_ops r6040
  #endif
  };
  
@@ -367,7 +365,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  static int __devinit r6040_init_one(struct pci_dev *pdev,
  					 const struct pci_device_id *ent)
  {
-@@ -1082,6 +1048,7 @@
+@@ -1082,6 +1048,7 @@ static int __devinit r6040_init_one(stru
  	static int card_idx = -1;
  	int bar = 0;
  	u16 *adrp;
@@ -375,7 +373,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  
  	printk("%s\n", version);
  
-@@ -1169,7 +1136,6 @@
+@@ -1169,7 +1136,6 @@ static int __devinit r6040_init_one(stru
  	/* Init RDC private data */
  	lp->mcr0 = 0x1002;
  	lp->phy_addr = phy_table[card_idx];
@@ -383,7 +381,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  
  	/* The RDC-specific entries in the device structure. */
  	dev->netdev_ops = &r6040_netdev_ops;
-@@ -1177,28 +1143,61 @@
+@@ -1177,28 +1143,61 @@ static int __devinit r6040_init_one(stru
  	dev->watchdog_timeo = TX_TIMEOUT;
  
  	netif_napi_add(dev, &lp->napi, r6040_poll, 64);
@@ -453,7 +451,7 @@ Index: linux-2.6.32.12/drivers/net/r6040.c
  err_out_unmap:
  	pci_iounmap(pdev, ioaddr);
  err_out_free_res:
-@@ -1212,8 +1211,12 @@
+@@ -1212,8 +1211,12 @@ err_out:
  static void __devexit r6040_remove_one(struct pci_dev *pdev)
  {
  	struct net_device *dev = pci_get_drvdata(pdev);
diff --git a/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch b/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
index 9012cb344..dded04e8d 100644
--- a/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
+++ b/target/linux/rdc/patches-2.6.32/100-rdc_boards.patch
@@ -10,7 +10,6 @@
  # drivers-y are linked after core-y
  drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
  drivers-$(CONFIG_PCI)            += arch/x86/pci/
-
 --- /dev/null
 +++ b/arch/x86/mach-rdc321x/Makefile
 @@ -0,0 +1,5 @@
diff --git a/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch b/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch
index 62cf4aabc..9181cf827 100644
--- a/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch
+++ b/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch
@@ -1,11 +1,11 @@
---- a/arch/x86/kernel/mfgpt_32.c	2010-03-15 09:52:04.000000000 -0600
-+++ b/arch/x86/kernel/mfgpt_32.c	2010-04-08 17:31:56.000000000 -0600
+--- a/arch/x86/kernel/mfgpt_32.c
++++ b/arch/x86/kernel/mfgpt_32.c
 @@ -33,7 +33,7 @@
  #include <linux/module.h>
  #include <asm/geode.h>
-
+ 
 -#define MFGPT_DEFAULT_IRQ	7
 +#define MFGPT_DEFAULT_IRQ	6
-
+ 
  static struct mfgpt_timer_t {
  	unsigned int avail:1;