summaryrefslogtreecommitdiffstats
path: root/target/linux/generic
Commit message (Collapse)AuthorAgeFilesLines
...
* mvebu: add inital support for Marvell Armada XP/370 SoCsflorian2013-01-081-0/+1
| | | | | | | | | | | | | | | This brings in the initial support for the Marvell Armada XP/370 SoCs. Successfully tested on RD-A370-A1 and DB-MV784MP-GP boards the following interfaces: - Ethernet - SDIO - GPIOs - SATA Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35058 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add support for 3.8-rc2florian2013-01-08150-1/+29125
| | | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35055 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add missing config symbolnbd2013-01-063-0/+9
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35021 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [kernel] missing underscore in 3.3 regmap patchblogic2013-01-061-1/+1
| | | | | | Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35018 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: port the regmap fix to 3.6 (#12749), refresh patches for other versionsnbd2013-01-053-21/+25
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35016 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [kernel] fix regmap debloat patchblogic2013-01-052-14/+57
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35015 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: move regmap bloat out of the kernel image if it is only being used ↵nbd2013-01-033-0/+97
| | | | | | in modules git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34999 3c298f89-4303-0410-b956-a3cf2f4a3e73
* brcm47xx: add bgmac driverhauke2013-01-032-0/+2
| | | | | | | | | | This Ethernet driver is in early development stage and still has some problems. This was working on my bcm4716 based device. Thanks to Rafał Miłecki <zajec5@gmail.com> for writing this driver. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34995 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: add some missing kernel config symbols spotted on x86jow2013-01-023-0/+6
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34981 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: fix UBIFS build error if XZ compression is disabledjuhosg2013-01-023-3/+3
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34959 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: add missing symbol for 3.7juhosg2013-01-011-0/+1
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34947 3c298f89-4303-0410-b956-a3cf2f4a3e73
* mips: use -mno-branch-likely for kernel and userspace, saves ~11k kernel ↵nbd2012-12-283-1/+23
| | | | | | size after lzma and ~12k squashfs size in the default configuration git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34909 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: remove the cisco SIP NAT patch, at least on 3.6 it crashesnbd2012-12-272-236/+0
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34901 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: more missing symbols for 3.{6,7}juhosg2012-12-262-0/+5
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34887 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: ar8216: add sgmii_delay_en field to ar8327_platform_datajuhosg2012-12-253-0/+5
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34881 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: ar8216: don't use 0 as default VID on AR8327juhosg2012-12-221-1/+3
| | | | | | | | VID0 is reserved for priority-tagged packets. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34862 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: more missing symbols for 3.{6,7}juhosg2012-12-222-0/+4
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34861 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: ar8316: allow to configure port 6 via platform data on AR8327juhosg2012-12-222-17/+19
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34847 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: ar8216: rename cpuport_cfg to port0_cfg in ar8327_platform_datajuhosg2012-12-222-2/+2
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34846 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic/3.6: add platform specific power callbacks to {e,o}hci_platform driversjuhosg2012-12-224-0/+305
| | | | | | | | | | | | | Backport of upstream commits: 86e4cb35f2260374df4139c2352afe7fe247cb60 usb: host: ehci-platform: BUG_ON() to WARN_ON() on probe b6dd245c4594482d46507a0bfd100439be367952 usb: host: ohci-platform: BUG_ON() to WARN_ON() on probe 04216bedafb1b3992a6c2b7f1518281d2ba5fc7b usb: host: ehci-platform: add platform specific power callback e4d37aeb373a5edceecc1dadc76fabbe8bc18e44 usb: host: ohci-platform: addplatform specific power callback Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34842 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [kernel] make to rtl8366_smi of binding use gpio_is_validblogic2012-12-211-1/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34816 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add solos-pci update for 3.3juhosg2012-12-211-16/+425
| | | | | | | | | | | | | | Same patches that I just merged for 3.6 and 3.7, except with one additional fix that went into v3.4 that needed to be included. Submitted more for the benefit of the AA branch than for trunk. [juhosg: refresh the patch with quilt] Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34813 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add solos-pci patches from 3.8 for new hardwarejuhosg2012-12-202-32/+800
| | | | | | | | | [juhosg: refresh patches with quilt, skip the patch for 3.3] Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34806 3c298f89-4303-0410-b956-a3cf2f4a3e73
* linux: add missing symbols for 3.{6,7}juhosg2012-12-202-0/+16
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34805 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Do not use deprecated path to functions.sh (/etc/functions.sh -> ↵mirko2012-12-191-1/+1
| | | | | | /lib/functions.sh) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34793 3c298f89-4303-0410-b956-a3cf2f4a3e73
* Do not overload mount-call - trying to reduce confusionmirko2012-12-191-12/+12
| | | | | | | | | | | The behaviour of calling 'mount' differed depending on whether it called the busybox-mount, the mount of util-linux, the mount defined in /lib/functions.sh and /lib/functions/boot.sh /etc/preinit even included /lib/functions.sh and /lib/functions/boot.sh, both re-defining 'mount'. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34792 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: disable crashlog on ppcjuhosg2012-12-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It causes panic on boot: [ 0.194287] __ioremap(): phys addr 0x1f00000 is RAM lr crashlog_init_fs [ 0.200902] Unable to handle kernel paging request for data at address 0x00000000 [ 0.208347] Faulting instruction address: 0xc026cb10 [ 0.213282] Oops: Kernel access of bad area, sig: 11 [#1] [ 0.218586] PowerPC 40x Platform [ 0.221783] Modules linked in: [ 0.224817] NIP: c026cb10 LR: c026cb10 CTR: c000c1b8 [ 0.229745] REGS: c1825ed0 TRAP: 0300 Not tainted (3.6.11) [ 0.235435] MSR: 00029030 <EE,ME,IR,DR> CR: 42004082 XER: 00000000 [ 0.241745] DEAR: 00000000, ESR: 00000000 [ 0.245724] TASK = c181e000[1] 'swapper' THREAD: c1824000 GPR00: c026cb10 c1825f80 c181e000 00000000 0000004b 0000004b c029a4dd 6f675f69 GPR08: 6e69745f c0290440 00000000 00000000 22004084 00000000 01ffc400 004011f8 GPR16: 00000001 ffffffff 00000000 007fff00 01ff6120 01f94298 01fff258 c02631b8 GPR24: c02604bc 00000019 c02a0000 c02a0000 c027c644 00000000 c02c0000 c02bd388 [ 0.279089] NIP [c026cb10] crashlog_init_fs+0x30/0xe0 [ 0.284095] LR [c026cb10] crashlog_init_fs+0x30/0xe0 [ 0.289000] Call Trace: [ 0.291442] [c1825f80] [c026cb10] crashlog_init_fs+0x30/0xe0 (unreliable) [ 0.298185] [c1825f90] [c00023fc] do_one_initcall+0xdc/0x1c8 [ 0.303812] [c1825fc0] [c02638c4] kernel_init+0x110/0x1a4 [ 0.309154] [c1825ff0] [c000ad4c] kernel_thread+0x4c/0x68 [ 0.314488] Instruction dump: [ 0.317429] 9421fff0 7c0802a6 bfc10008 3fc0c02c 90010014 3bfed388 3800fff4 807f0004 [ 0.325117] 2f830000 41be00a4 38804000 4bda2809 <81630000> 7c691b78 907ed388 6d605e11 Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34773 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: add missing symbols for 3.{6,7}juhosg2012-12-182-0/+4
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34772 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update linux 3.7 to 3.7.1juhosg2012-12-183-14/+8
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34760 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: Fix Cisco SIP NAT patch to build with 3.7juhosg2012-12-181-8/+14
| | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34753 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add missing config option BATTERY_DS2781 for 3.7juhosg2012-12-181-0/+1
| | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34749 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update linux 3.6 to 3.6.11juhosg2012-12-185-67/+4
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34748 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix a warning in the O_DIRECT debloat patchnbd2012-12-172-22/+2
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34740 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add some debloat patches, strip down procfs and make O_DIRECT ↵nbd2012-12-178-0/+986
| | | | | | support optional, saves ~15K after lzma on MIPS git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34737 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: rtl836x: fix compiler warningsjuhosg2012-12-174-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CC drivers/net/phy/rtl8366rb.o In file included from drivers/net/phy/rtl8366s.c:16:0: include/linux/of_platform.h:106:13: warning: 'struct device' declared inside parameter list [enabled by default] include/linux/of_platform.h:106:13: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/net/phy/rtl8366s.c: In function 'rtl8366s_probe': drivers/net/phy/rtl8366s.c:1094:2: warning: label 'err_out' defined but not used [-Wunused-label] drivers/net/phy/rtl8366s.c:1055:32: warning: unused variable 'pdata'[-Wunused-variable] CC drivers/net/phy/rtl8366rb.o In file included from drivers/net/phy/rtl8366rb.c:17:0: include/linux/of_platform.h:106:13: warning: 'struct device' declared inside parameter list [enabled by default] include/linux/of_platform.h:106:13: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/net/phy/rtl8366rb.c: In function 'rtl8366rb_probe': drivers/net/phy/rtl8366rb.c:1214:2: warning: label 'err_out' defined but not used [-Wunused-label] drivers/net/phy/rtl8366rb.c:1175:32: warning: unused variable 'pdata'[-Wunused-variable] CC drivers/net/phy/rtl8367.o In file included from drivers/net/phy/rtl8367.c:15:0: include/linux/of_platform.h:106:13: warning: 'struct device' declared inside parameter list [enabled by default] include/linux/of_platform.h:106:13: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/net/phy/rtl8367.c: In function 'rtl8367_probe': drivers/net/phy/rtl8367.c:1712:2: warning: label 'err_out' defined but not used [-Wunused-label] drivers/net/phy/rtl8367.c:1677:32: warning: unused variable 'pdata' [-Wunused-variable] CC drivers/net/phy/rtl8367b.o In file included from drivers/net/phy/rtl8367b.c:15:0: include/linux/of_platform.h:106:13: warning: 'struct device' declared inside parameter list [enabled by default] include/linux/of_platform.h:106:13: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/net/phy/rtl8367b.c: In function 'rtl8367b_probe': drivers/net/phy/rtl8367b.c:1494:2: warning: label 'err_out' defined but not used [-Wunused-label] drivers/net/phy/rtl8367b.c:1459:32: warning: unused variable 'pdata' [-Wunused-variable] Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34731 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: add a missing config symbol for 3.7nbd2012-12-151-0/+1
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34710 3c298f89-4303-0410-b956-a3cf2f4a3e73
* linux: generic: rtl836*: fix compilation with !CONFIG_OFjogo2012-12-156-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes the following errors caused by r34682: CC [M] drivers/net/phy/rtl8366_smi.o In file included from drivers/net/phy/rtl8366_smi.c:26:0: drivers/net/phy/rtl8366_smi.h:149:46: warning: 'struct platform_device' declared inside parameter list [enabled by default] drivers/net/phy/rtl8366_smi.h:149:46: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] drivers/net/phy/rtl8366_smi.c:1398:65: warning: 'struct platform_device' declared inside parameter list [enabled by default] drivers/net/phy/rtl8366_smi.c: In function 'rtl8366_smi_probe_plat': drivers/net/phy/rtl8366_smi.c:1400:44: error: dereferencing pointer to incomplete type drivers/net/phy/rtl8366_smi.c:1402:11: error: dereferencing pointer to incomplete type drivers/net/phy/rtl8366_smi.c:1403:16: error: dereferencing pointer to incomplete type drivers/net/phy/rtl8366_smi.c: At top level: drivers/net/phy/rtl8366_smi.c:1415:46: warning: 'struct platform_device' declared inside parameter list [enabled by default] drivers/net/phy/rtl8366_smi.c:1415:21: error: conflicting types for 'rtl8366_smi_probe' drivers/net/phy/rtl8366_smi.h:149:21: note: previous declaration of 'rtl8366_smi_probe' was here drivers/net/phy/rtl8366_smi.c: In function 'rtl8366_smi_probe': drivers/net/phy/rtl8366_smi.c:1420:31: error: dereferencing pointer to incomplete type drivers/net/phy/rtl8366_smi.c:1424:10: error: dereferencing pointer to incomplete type drivers/net/phy/rtl8366_smi.c:1425:3: warning: passing argument 1 of 'rtl8366_smi_probe_of' from incompatible pointer type [enabled by default] drivers/net/phy/rtl8366_smi.c:1392:19: note: expected 'struct device_node *' but argument is of type 'struct platform_device *' drivers/net/phy/rtl8366_smi.c:1427:3: warning: passing argument 1 of 'rtl8366_smi_probe_plat' from incompatible pointer type [enabled by default] drivers/net/phy/rtl8366_smi.c:1398:5: note: expected 'struct platform_device *' but argument is of type 'struct platform_device *' drivers/net/phy/rtl8366_smi.c: At top level: drivers/net/phy/rtl8366_smi.c:1438:1: error: conflicting types for 'rtl8366_smi_probe' drivers/net/phy/rtl8366_smi.h:149:21: note: previous declaration of 'rtl8366_smi_probe' was here make[7]: *** [drivers/net/phy/rtl8366_smi.o] Error 1 make[6]: *** [drivers/net/phy] Error 2 make[5]: *** [drivers/net] Error 2 make[4]: *** [drivers] Error 2 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34703 3c298f89-4303-0410-b956-a3cf2f4a3e73
* [kernel] make rtl8366 driver OF capableblogic2012-12-156-66/+121
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34682 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: export include/linux/switch.h on 3.3, 3.6juhosg2012-12-142-0/+20
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34678 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: disintegrate UAPI from include/linux/switch.hjuhosg2012-12-145-81/+308
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34677 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: refresh patchesjuhosg2012-12-146-30/+10
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34676 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: update pci_disable_usb_common_quirks patchjuhosg2012-12-142-18/+7
| | | | | | | | | Fixes the following compiler warning: drivers/usb/host/pci-quirks.c:459:23: warning: 'quirk_usb_handoff_uhci' defined but not used [-Wunused-function] Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34675 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix solos-pci skb double-free in DMA modejuhosg2012-12-133-0/+99
| | | | | | | | | [juhosg: refresh the patches with quilt] Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34667 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix perf build with uclibc toolchains on x86florian2012-12-133-0/+96
| | | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34666 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel/3.6: backport an upstream build for perf with uClibcflorian2012-12-131-0/+40
| | | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34662 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: fix porting mistakes on the 3.6+ SIP NAT patch causing crashesnbd2012-12-132-46/+20
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34657 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testinghauke2012-12-1218-212/+3485
| | | | git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34651 3c298f89-4303-0410-b956-a3cf2f4a3e73
* generic: fix 8139cp patch for 3.6juhosg2012-12-121-1/+19
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34640 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update linux 3.6 to 3.6.10juhosg2012-12-113-31/+3
| | | | | | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34639 3c298f89-4303-0410-b956-a3cf2f4a3e73
* kernel: update to 3.7 finalflorian2012-12-111-39/+0
| | | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34626 3c298f89-4303-0410-b956-a3cf2f4a3e73