Merge branch 'master' of git://nbd.name/openwrt

include/kernel-version.mk

@@ -35,8 +35,8 @@ endif
 ifeq ($(LINUX_VERSION),3.1.10)
   LINUX_KERNEL_MD5SUM:=3649bdaa50ffd9114cc16486ec54d83a
 endif
-ifeq ($(LINUX_VERSION),3.2.12)
-  LINUX_KERNEL_MD5SUM:=e3dd3772f0cf14d444a3fb474bd624fe
+ifeq ($(LINUX_VERSION),3.2.13)
+  LINUX_KERNEL_MD5SUM:=1966afd4474000e48fb1e22a5991882e
 endif
 ifeq ($(LINUX_VERSION),3.3)
   LINUX_KERNEL_MD5SUM:=98a6cdd7d082b7ea72df9c89842bac74

package/libnl-tiny/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnl-tiny
 PKG_VERSION:=0.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
 

package/libnl-tiny/src/socket.c

@@ -59,7 +59,7 @@ static void release_local_port(uint32_t port)
 		return;
 
 	nr = port >> 22;
-	used_ports_map[nr / 32] &= ~((nr % 32) + 1);
+	used_ports_map[nr / 32] &= ~(1 << nr % 32);
 }
 
 /**

target/linux/ar71xx/Makefile

@@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz
 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
 SUBTARGETS:=generic nand
 
-LINUX_VERSION:=3.2.12
+LINUX_VERSION:=3.2.13
 
 include $(INCLUDE_DIR)/target.mk
 

target/linux/ar71xx/patches-3.2/613-MIPS-ath79-RB750GL-support.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -51,6 +51,7 @@ enum ath79_mach_type {
+@@ -52,6 +52,7 @@ enum ath79_mach_type {
  	ATH79_MACH_RB_493,		/* Mikrotik RouterBOARD 493/493AH */
  	ATH79_MACH_RB_493G,		/* Mikrotik RouterBOARD 493G */
  	ATH79_MACH_RB_750,		/* MikroTik RouterBOARD 750 */

target/linux/au1000/Makefile

@@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci
 SUBTARGETS=au1500 au1550
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.2.12
+LINUX_VERSION:=3.2.13
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini yamonenv

target/linux/brcm47xx/Makefile

@@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb pcmcia
 
-LINUX_VERSION:=3.2.12
+LINUX_VERSION:=3.2.13
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram

target/linux/cns21xx/Makefile

@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx
 FEATURES:=squashfs broken
 CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
 
-LINUX_VERSION:=3.2.12
+LINUX_VERSION:=3.2.13
 
 include $(INCLUDE_DIR)/target.mk
 

target/linux/ep93xx/Makefile

@@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb
 CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.2.12
+LINUX_VERSION:=3.2.13
 
 include $(INCLUDE_DIR)/target.mk
 

target/linux/generic/config-3.2

@@ -593,6 +593,7 @@ CONFIG_DEVPORT=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 CONFIG_EFI_PARTITION=y
@@ -2152,6 +2153,7 @@ CONFIG_RD_LZMA=y
 # CONFIG_RT2X00 is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
 # CONFIG_RTC_DRV_BQ32K is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
 CONFIG_RTC_DRV_CMOS=y
@@ -2180,6 +2182,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
 # CONFIG_RTC_DRV_MSM6242 is not set
 # CONFIG_RTC_DRV_PCF2123 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
@@ -2471,6 +2474,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_MAX3107 is not set
 # CONFIG_SERIAL_MFD_HSU is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
@@ -2607,6 +2611,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
 # CONFIG_SND_MPU401 is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_MTS64 is not set
@@ -2640,6 +2645,8 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_SSCAPE is not set
@@ -2688,6 +2695,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_ORION is not set
 # CONFIG_SPI_PPC4xx is not set
@@ -2698,6 +2707,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
@@ -2934,6 +2944,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_GSPCA_ZC3XX is not set
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_WEBCAM is not set
 # CONFIG_USB_HID is not set
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HSO is not set
@@ -2960,6 +2971,7 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_MASS_STORAGE is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_MON is not set
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_MUSB_HDRC is not set

target/linux/generic/config-3.3

@@ -601,6 +601,7 @@ CONFIG_DQL=y
 # CONFIG_EEPROM_93XX46 is not set
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
+# CONFIG_EEPROM_DIGSY_MTC_CFG is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 CONFIG_EFI_PARTITION=y
@@ -2179,6 +2180,7 @@ CONFIG_RD_LZMA=y
 # CONFIG_RT2X00 is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_RTC_DEBUG is not set
+# CONFIG_RTC_DRV_AU1XXX is not set
 # CONFIG_RTC_DRV_BQ32K is not set
 # CONFIG_RTC_DRV_BQ4802 is not set
 CONFIG_RTC_DRV_CMOS=y
@@ -2207,6 +2209,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_MPC5121 is not set
 # CONFIG_RTC_DRV_MSM6242 is not set
 # CONFIG_RTC_DRV_PCF2123 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
@@ -2497,6 +2500,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_MAX3107 is not set
 # CONFIG_SERIAL_MFD_HSU is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
 # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_TIMBERDALE is not set
@@ -2632,6 +2636,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_MONA is not set
+# CONFIG_SND_MPC52xx_SOC_EFIKA is not set
 # CONFIG_SND_MPU401 is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_MTS64 is not set
@@ -2665,6 +2670,8 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_MPC5200_I2S is not set
+# CONFIG_SND_SOC_MPC5200_AC97 is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_SSCAPE is not set
@@ -2712,6 +2719,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_MASTER is not set
+# CONFIG_SPI_MPC52xx is not set
+# CONFIG_SPI_MPC52xx_PSC is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_ORION is not set
 # CONFIG_SPI_PPC4xx is not set
@@ -2722,6 +2731,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_XWAY is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
@@ -2963,6 +2973,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_G_ACM_MS is not set
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_WEBCAM is not set
 # CONFIG_USB_HID is not set
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HSO is not set
@@ -2989,6 +3000,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_MASS_STORAGE is not set
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_MON is not set
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_MUSB_HDRC is not set

target/linux/generic/patches-3.2/120-ppp_txqueue_restart.patch

@@ -22,8 +22,8 @@ harmless in the TX path.
 
 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
 
---- a/drivers/net/ppp/ppp_generic.c~	2012-01-26 00:39:32.000000000 +0000
-+++ b/drivers/net/ppp/ppp_generic.c	2012-03-26 10:32:31.286744147 +0100
+--- a/drivers/net/ppp/ppp_generic.c
++++ b/drivers/net/ppp/ppp_generic.c
 @@ -235,7 +235,7 @@ struct ppp_net {
  /* Prototypes. */
  static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
@@ -73,10 +73,3 @@ Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  }
 
  static inline struct sk_buff *
-
--- 
-David Woodhouse                            Open Source Technology Centre
-David.Woodhouse@intel.com                              Intel Corporation
-
-
-

target/linux/lantiq/Makefile

@@ -12,7 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY
 FEATURES:=squashfs jffs2
 DEFAULT_SUBTARGET:=danube
 
-LINUX_VERSION:=3.2.12
+LINUX_VERSION:=3.2.13
 
 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
 

target/linux/lantiq/patches-3.2/0001-GPIO-add-bindings-for-managed-devices.patch

@@ -15,8 +15,6 @@ Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  3 files changed, 95 insertions(+), 1 deletions(-)
  create mode 100644 drivers/gpio/devres.c
 
-diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 4e018d6..76dbd3f 100644
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
 @@ -2,7 +2,7 @@
@@ -28,9 +26,6 @@ index 4e018d6..76dbd3f 100644
 
  # Device drivers. Generally keep list sorted alphabetically
  obj-$(CONFIG_GPIO_GENERIC)	+= gpio-generic.o
-diff --git a/drivers/gpio/devres.c b/drivers/gpio/devres.c
-new file mode 100644
-index 0000000..3dd2939
 --- /dev/null
 +++ b/drivers/gpio/devres.c
 @@ -0,0 +1,90 @@
@@ -124,11 +119,9 @@ index 0000000..3dd2939
 +	gpio_free(gpio);
 +}
 +EXPORT_SYMBOL(devm_gpio_free);
-diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
-index 8c86210..8601a02 100644
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
-@@ -175,6 +175,10 @@ extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *labe
+@@ -175,6 +175,10 @@ extern int gpio_request_one(unsigned gpi
  extern int gpio_request_array(const struct gpio *array, size_t num);
  extern void gpio_free_array(const struct gpio *array, size_t num);
 
@@ -139,6 +132,3 @@ index 8c86210..8601a02 100644
  #ifdef CONFIG_GPIO_SYSFS
 
  /*
--- 
-1.7.7.1
-

target/linux/lantiq/patches-3.2/0002-MIPS-remove-unused-prototype-kgdb_config.patch

@@ -7,8 +7,6 @@ Subject: [PATCH 02/70] MIPS: remove unused prototype kgdb_config
  arch/mips/include/asm/mips-boards/generic.h |    4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)
 
-diff --git a/arch/mips/include/asm/mips-boards/generic.h b/arch/mips/include/asm/mips-boards/generic.h
-index 46c0856..6e23ceb 100644
 --- a/arch/mips/include/asm/mips-boards/generic.h
 +++ b/arch/mips/include/asm/mips-boards/generic.h
 @@ -93,8 +93,4 @@ extern void mips_pcibios_init(void);
@@ -20,6 +18,3 @@ index 46c0856..6e23ceb 100644
 -#endif
 -
  #endif  /* __ASM_MIPS_BOARDS_GENERIC_H */
--- 
-1.7.7.1
-

target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch

@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  drivers/mtd/maps/lantiq-flash.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
-index 4f10e27..764d468 100644
 --- a/drivers/mtd/maps/lantiq-flash.c
 +++ b/drivers/mtd/maps/lantiq-flash.c
 @@ -45,6 +45,7 @@ struct ltq_mtd {
@@ -25,7 +23,7 @@ index 4f10e27..764d468 100644
 
  static map_word
  ltq_read16(struct map_info *map, unsigned long adr)
-@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pdev)
+@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pd
  	cfi->addr_unlock1 ^= 1;
  	cfi->addr_unlock2 ^= 1;
 
@@ -34,6 +32,3 @@ index 4f10e27..764d468 100644
  			ltq_mtd_data->parts, ltq_mtd_data->nr_parts);
  	if (err) {
  		dev_err(&pdev->dev, "failed to add partitions\n");
--- 
-1.7.7.1
-

target/linux/lantiq/patches-3.2/0004-MTD-add-m25p80-id-for-mx25l2005a.patch

@@ -7,18 +7,13 @@ Subject: [PATCH 04/70] MTD: add m25p80 id for mx25l2005a
  drivers/mtd/devices/m25p80.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
-index 884904d..3f37f5f 100644
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -676,6 +676,7 @@ static const struct spi_device_id m25p_ids[] = {
+@@ -684,6 +684,7 @@ static const struct spi_device_id m25p_i
  	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
 
  	/* Macronix */
 +	{ "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   8, SECT_4K) },
  	{ "mx25l4005a",  INFO(0xc22013, 0, 64 * 1024,   8, SECT_4K) },
  	{ "mx25l8005",   INFO(0xc22014, 0, 64 * 1024,  16, 0) },
  	{ "mx25l1606e",  INFO(0xc22015, 0, 64 * 1024,  32, SECT_4K) },
--- 
-1.7.7.1
-