hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-10-31 05:54:26 -04:00
Code Issues Projects Releases Wiki Activity
8,915 Commits 10 Branches 85 Tags 262 MiB
deb3f95996
Commit Graph

387 Commits

Author SHA1 Message Date
Gabor Juhos
962738bdac make morse LED trigger available for all platforms 
SVN-Revision: 9055
 2007-09-28 20:06:52 +00:00
Nicolas Thill
0bf90f2a0d add ipv6 conntrack support (closes: #2192) 
SVN-Revision: 8984
 2007-09-23 17:22:17 +00:00
Nicolas Thill
5f0272d618 move crypto support to a seperate crypto.mk file, split modules into multiple packages and adjust dependencies, sync crypto options in kconfigs. 
SVN-Revision: 8980
 2007-09-23 15:12:12 +00:00
Nicolas Thill
40d44d26af backport [8862] to pre 2.6.22 kernels as well 
SVN-Revision: 8975
 2007-09-23 11:12:54 +00:00
Felix Fietkau
b4142edc77 make ATM_DRIVERS default to n 
SVN-Revision: 8967
 2007-09-22 23:36:37 +00:00
Nicolas Thill
fec4d9ee3c add missing 2.6 conntrack/nat helpers, add 2.6 conntrack/nat helper for RTSP (closes: #2297, thanks to aorlinsk), sync 2.4 / 2.6 kconfigs. 
SVN-Revision: 8955
 2007-09-22 18:37:24 +00:00
Matteo Croce
8d162264af Make ar7_part more readable and endianness safe 
SVN-Revision: 8886
 2007-09-20 19:25:38 +00:00
Nicolas Thill
926e05ef37 build IPsec transports as modules, rename kmod-ipip to kmod-iptunnel4 and add kmod-iptunnel6. 
SVN-Revision: 8862
 2007-09-20 10:03:41 +00:00
Felix Fietkau
abbe02e2fb enable jffs2 summary for faster mount time 
SVN-Revision: 8846
 2007-09-19 20:43:31 +00:00
Florian Fainelli
114a03a429 Rearrange patches 
SVN-Revision: 8729
 2007-09-10 14:19:56 +00:00
Felix Fietkau
a9d683ca91 major target cleanup. it is now possible to have subtargets that can override many target settings, including arch - merge adm5120, adm5120eb. target profiles still need to be adapted for subtargets 
SVN-Revision: 8694
 2007-09-08 19:55:42 +00:00
Florian Fainelli
8505138db8 Add some EHCI related symbols when usb is selected 
SVN-Revision: 8686
 2007-09-08 10:28:18 +00:00
Nicolas Thill
62637bcce1 rename 2.6 high-speed usb serial fix to match 2.4 one 
SVN-Revision: 8574
 2007-09-02 14:20:11 +00:00
Nicolas Thill
939c7224a2 build eeprom_93cx6 as a module, add a KernelPackage for it and for crc-itu-t 
SVN-Revision: 8559
 2007-08-30 22:19:26 +00:00
Nicolas Thill
a28a3e814b add high-speed usb serial fix from Junxion (closes: #2274) 
SVN-Revision: 8549
 2007-08-30 16:04:31 +00:00
Florian Fainelli
e384acd55d Add the icplus phy patch, will be required for the r6040 driver later, thanks to Daniel Gimpelevich 
SVN-Revision: 8470
 2007-08-23 15:48:46 +00:00
Florian Fainelli
875475af7d Compile crc itu-t as a module 
SVN-Revision: 8449
 2007-08-21 09:34:02 +00:00
Felix Fietkau
4460bbca47 add refresh ioctl to mtd (for rescanning partitions after reflash) 
SVN-Revision: 8438
 2007-08-19 21:53:17 +00:00
Felix Fietkau
7f04ef6341 disable romfs, nothing uses it 
SVN-Revision: 8430
 2007-08-19 10:01:17 +00:00
Felix Fietkau
ce9fff401a fix an off-by-one error 
SVN-Revision: 8427
 2007-08-19 01:06:26 +00:00
Florian Fainelli
99799c7cdf Remove the eeprom patches, but move the git-newsetup to generic, so that the x86 target can benefit from them 
SVN-Revision: 8374
 2007-08-07 09:43:05 +00:00
Florian Fainelli
c415751426 Also add eeprom 93cx6 to generic-2.6 
SVN-Revision: 8372
 2007-08-07 09:38:41 +00:00
Florian Fainelli
560411655b More rdc-2.6 fixes by Daniel Gimpelevich, thanks ! 
SVN-Revision: 8355
 2007-08-06 18:48:58 +00:00
Florian Fainelli
0a72fc6dff Add CONFIG_HID to not set by default 
SVN-Revision: 8304
 2007-08-01 14:56:33 +00:00
Florian Fainelli
c09d4cec7d Fix the remaining kernel config options (#2102) 
SVN-Revision: 8276
 2007-07-31 14:59:11 +00:00
Florian Fainelli
f1b2dbceb2 Add the 93cx6 patch to generic-2.6, correctly fix dependencies on the rt2x00 drivers (thanks to Daniel Gimpelevich) 
SVN-Revision: 8200
 2007-07-27 18:13:35 +00:00
Rod Whitby
807db2473d Removed the obsolete MTD_SPLIT_ROOTFS config symbol. 
SVN-Revision: 8193
 2007-07-27 12:59:39 +00:00
Rod Whitby
4e1630f4b6 Add missing config symbols that stop a default 2.6.21.6 built - set them all to default values so nothing changes for anyone 
SVN-Revision: 8191
 2007-07-27 08:09:04 +00:00
Felix Fietkau
700067c881 fix yealink kmod compile 
SVN-Revision: 8089
 2007-07-21 01:00:42 +00:00
Felix Fietkau
7705412da1 fix kmod-pwc compile 
SVN-Revision: 8088
 2007-07-21 00:50:31 +00:00
Gabor Juhos
3c7aec6185 rootfs_split: fix a typo, and fix compiler warnings 
SVN-Revision: 8082
 2007-07-20 18:32:48 +00:00
Felix Fietkau
cf633b733a fix rootfs split partition renaming (fix by Eric L. Chen) 
SVN-Revision: 8081
 2007-07-20 18:09:00 +00:00
Gabor Juhos
0ce7096e40 restore Kconfig options of rootfs_split for 2.6.21.5 
SVN-Revision: 8064
 2007-07-19 17:15:32 +00:00
Gabor Juhos
a66d3dd9d2 rootfs_split fixes * avoid compiler warnings on 2.6.22.1 * applies cleanly on 2.6.21.5 
SVN-Revision: 8060
 2007-07-19 15:52:37 +00:00
Gabor Juhos
934a641058 clean of the rootfs_split patch 
SVN-Revision: 8047
 2007-07-19 07:13:20 +00:00
Felix Fietkau
2255889b03 add missing config symbols 
SVN-Revision: 8035
 2007-07-18 13:42:04 +00:00
Felix Fietkau
a52d2e2214 disable a few things that are not packaged yet 
SVN-Revision: 8030
 2007-07-18 12:02:17 +00:00
Felix Fietkau
8e42553971 dynamically enable/disable kernel config options for kmod packages based on build system config 
SVN-Revision: 8026
 2007-07-18 11:31:01 +00:00
Felix Fietkau
e3a7ac074a fix ipp2p 
SVN-Revision: 8005
 2007-07-16 16:07:32 +00:00
Felix Fietkau
56ac6f5bea disable __must_check by default 
SVN-Revision: 7996
 2007-07-16 05:20:28 +00:00
Felix Fietkau
f82f62b992 fix layer7 for 2.6.21 
SVN-Revision: 7951
 2007-07-12 21:34:20 +00:00
Felix Fietkau
f82e310cd2 fix a typo in the imq module (patch from #2005) 
SVN-Revision: 7908
 2007-07-10 20:42:26 +00:00
Felix Fietkau
0d3d6051b3 update imq patches (fixes #2009) 
SVN-Revision: 7847
 2007-07-02 06:31:27 +00:00
Felix Fietkau
9801602a93 upgrade layer7 to the latest version and add fixes for 2.6.21 and 2.6.22-rc - compile tested on .21, run time tested on .22-rc6 
SVN-Revision: 7846
 2007-07-02 02:10:01 +00:00
Peter Denison
46d194834b Move SSB out of brcm47xx target into generic-2.6 target 
SVN-Revision: 7844
 2007-07-01 22:44:05 +00:00
Felix Fietkau
9bf6078866 unify sysctl.conf, add extra netfilter options (#1996) 
SVN-Revision: 7784
 2007-06-30 02:59:09 +00:00
Peter Denison
164e789c7a Merge mac80211 driver from tree at bu3sch.de, pulled 24/6 
SVN-Revision: 7733
 2007-06-25 19:52:20 +00:00
Felix Fietkau
8c41e51e92 fix failsafe on broadcom, send netlink events in diag when running linux 2.6 
SVN-Revision: 7722
 2007-06-25 08:32:25 +00:00
Felix Fietkau
10a781acf2 brcm47xx-2.6: update for 2.6.22-rc5 
SVN-Revision: 7699
 2007-06-22 03:49:54 +00:00
Peter Denison
f9bf3a0e4f Extra bits from wireless-dev for the mac80211 stack - should just be additions 
SVN-Revision: 7695
 2007-06-21 21:51:07 +00:00
Peter Denison
8fb92b3a2f make 130-netfilter-ipset.patch apply under 2.6.22-rc[45] 
SVN-Revision: 7694
 2007-06-21 21:29:37 +00:00
Felix Fietkau
b94b11e11e minor kernel config sync 
SVN-Revision: 7690
 2007-06-21 17:53:08 +00:00
Felix Fietkau
b74715a0b6 add mini_fo fix from #1801 
SVN-Revision: 7676
 2007-06-20 00:16:41 +00:00
Felix Fietkau
099a78bf53 fix ipset compile with 2.6.22-rc4 
SVN-Revision: 7647
 2007-06-17 00:06:58 +00:00
Felix Fietkau
af15136e8d remove empty patches 
SVN-Revision: 7645
 2007-06-16 02:08:06 +00:00
Felix Fietkau
f019ac4dc9 prepare for the transition to linux 2.6.22 - make it possible to override the kernel version in the target makefile 
SVN-Revision: 7644
 2007-06-16 01:56:04 +00:00
Tim Yardley
f78de29500 fixed ipset patch to make it work right from userland 
SVN-Revision: 7565
 2007-06-11 14:52:31 +00:00
Florian Fainelli
4a00419fd0 Update the yaffs patch to include the fix by Giampaolo Mancini (mancho), closes #1779 
SVN-Revision: 7534
 2007-06-08 12:36:58 +00:00
Imre Kaloz
08c7265613 add support for the AVR32 platform, namely the ATNGW100 board - joint work with wigyori 
SVN-Revision: 7533
 2007-06-08 10:44:01 +00:00
Felix Fietkau
f082d1fddf add ar7-2.6 fixes by Stefan Weil 
SVN-Revision: 7487
 2007-06-04 09:46:30 +00:00
Felix Fietkau
2801c15eaa more kernel config cleanup 
SVN-Revision: 7412
 2007-05-31 09:31:44 +00:00
Mike Baker
76ffe92fe7 fix the damn kernel config 
SVN-Revision: 7411
 2007-05-31 09:29:27 +00:00
Florian Fainelli
accffe1a0c Updated yaffs2, thanks to David Goodenough (#1779) 
SVN-Revision: 7405
 2007-05-30 11:49:14 +00:00
Florian Fainelli
8831f0da3a Add support for USB HID (#1322) 
SVN-Revision: 7360
 2007-05-27 18:57:02 +00:00
Florian Fainelli
a2710a9eff Add yealink usb phone kernel packages 
SVN-Revision: 7359
 2007-05-27 18:51:50 +00:00
Felix Fietkau
cef4e6112c sync atheros-2.6 config, move parts to the generic config 
SVN-Revision: 7348
 2007-05-26 20:08:21 +00:00
Felix Fietkau
94c0d84182 refresh kernel patches so that they apply cleanly 
SVN-Revision: 7347
 2007-05-26 19:41:42 +00:00
Felix Fietkau
589d2a377d remove bogus netfilter dependencies 
SVN-Revision: 7344
 2007-05-26 18:14:11 +00:00
Felix Fietkau
e96de53782 enable TCPMSS target by default 
SVN-Revision: 7343
 2007-05-26 17:56:15 +00:00
Felix Fietkau
4c4b3a6317 move x86 lzma loader patch from generic patches into rdc-2.6 - it's causing problems at least in qemu, maybe on other systems as well and generic x86 doesn't really need the extra compression 
SVN-Revision: 7342
 2007-05-26 17:53:03 +00:00
Florian Fainelli
3368856944 add generic GPIO to MIPS boards, use it for au1000 and for the MTX-1 led driver as well 
SVN-Revision: 7334
 2007-05-24 23:30:35 +00:00
Imre Kaloz
022ac5019d fix Magicbox for .21 and convert to the new structure 
SVN-Revision: 7328
 2007-05-24 12:44:44 +00:00
Felix Fietkau
9ca9ccac79 nuke vga console support from the x86 lzma loader, it seems to cause problems at least in qemu 
SVN-Revision: 7325
 2007-05-24 00:52:37 +00:00
Imre Kaloz
15386a1583 aruba fixes, work in progress 
SVN-Revision: 7324
 2007-05-24 00:04:19 +00:00
Felix Fietkau
7e07265588 update x86 config and move some config defaults to the config template 
SVN-Revision: 7323
 2007-05-23 23:49:12 +00:00
Felix Fietkau
79a61de092 fix x86 lzma loader 
SVN-Revision: 7322
 2007-05-23 23:29:09 +00:00
Imre Kaloz
aa8d377d7e update netfilter patches, fix atheros 
SVN-Revision: 7320
 2007-05-23 23:10:09 +00:00
Felix Fietkau
227d9b1b0a fix x86-2.6 compile 
SVN-Revision: 7319
 2007-05-23 22:09:45 +00:00
Felix Fietkau
68adfabefb fix compile error in the netfilter ipset module 
SVN-Revision: 7318
 2007-05-23 21:40:19 +00:00
Imre Kaloz
615e8af841 break trunk temporary - upgrade to 2.6.21.1 and iptables 1.3.7 
SVN-Revision: 7315
 2007-05-23 19:48:34 +00:00
Felix Fietkau
6bab05790c make CONFIG_PCCARD disabled by default 
SVN-Revision: 7310
 2007-05-23 14:57:02 +00:00
Florian Fainelli
f0e08dea14 Fix duplicate entries in the patch 
SVN-Revision: 7289
 2007-05-20 19:53:45 +00:00
Florian Fainelli
231a4b3540 Add generic GPIO support to MIPS boards 
SVN-Revision: 7287
 2007-05-20 19:49:50 +00:00
Felix Fietkau
84b235140c fix pcmcia/pccard build defaults 
SVN-Revision: 7275
 2007-05-19 16:16:48 +00:00
Mike Baker
15e9bc4f26 forgot a file in [7158] 
SVN-Revision: 7161
 2007-05-10 09:55:23 +00:00
Mike Baker
854f0ad080 change handling of target/linux/generic-2.x/files to match other targets (#1648) 
SVN-Revision: 7158
 2007-05-10 08:35:48 +00:00
Felix Fietkau
ca7a815602 use hotplug2 for serializing hotplug events on 2.6 
SVN-Revision: 7097
 2007-05-05 18:33:18 +00:00
Florian Fainelli
afcfa1a55c make sure the ramdisk generation will work when you have defined a special TIMEFMT 
SVN-Revision: 7088
 2007-05-03 17:21:08 +00:00
Mike Baker
1ad24fe804 backport a few usb device ids from 2.6.21 for airprime 
SVN-Revision: 7077
 2007-05-01 21:57:03 +00:00
Felix Fietkau
383a21f3c5 use separate sysctl.conf files for 2.4 and 2.6 - fixes some boot message spam 
SVN-Revision: 7043
 2007-04-24 12:05:52 +00:00
Felix Fietkau
54a1fcd9c1 add tcp syn cookies support (fixes one of the sysctl error messages at boot time) 
SVN-Revision: 7042
 2007-04-24 11:51:35 +00:00
Felix Fietkau
332fe44ed2 move the lzma decompressor out of squashfs-lzma patch and into a new patch (i want to use it for initramfs in the future) 
SVN-Revision: 7001
 2007-04-18 16:03:43 +00:00
Florian Fainelli
f4997ac854 Enable videodev, but do not build all hardware modules 
SVN-Revision: 6961
 2007-04-16 07:55:05 +00:00
Florian Fainelli
71c2d045e3 Add lzma compression for x86 based targets 
SVN-Revision: 6960
 2007-04-16 06:45:05 +00:00
Tim Yardley
9504226efb fix default 2.6 kernel config so we dont halt at CMTP protocol support 
SVN-Revision: 6925
 2007-04-10 15:09:35 +00:00
Florian Fainelli
880b837992 Enable codepage 1250 support (#1554) 
SVN-Revision: 6906
 2007-04-08 21:18:19 +00:00
Florian Fainelli
2b58e31674 Add ISDN support (#1498) 
SVN-Revision: 6905
 2007-04-08 21:12:31 +00:00
Eugene Konev
74c927577d Fix free space size check 
SVN-Revision: 6880
 2007-04-07 10:36:31 +00:00
Florian Fainelli
2266aad2ec Limit the number of hotplug childrens 
SVN-Revision: 6804
 2007-04-01 18:30:32 +00:00
Felix Fietkau
5c9cbf119d clean up nfsd kernel config entries (#1523) 
SVN-Revision: 6731
 2007-03-27 23:41:05 +00:00
Florian Fainelli
f1b6a4ce42 Disable YAFFS and NAND by default 
SVN-Revision: 6717
 2007-03-26 19:54:54 +00:00
Florian Fainelli
7d55bb05fe Move the yaffs patch to be generic, shared between rb532 and adm5120 
SVN-Revision: 6716
 2007-03-26 19:42:33 +00:00
Eugene Konev
418ae3a045 Make lzma-loader sdram mapping configurable (#1169) 
SVN-Revision: 6598
 2007-03-18 09:32:22 +00:00
Felix Fietkau
dcfbd5f656 fix up remaining parts for the brcm47xx-2.6 port (tested on wgt634u), nuke the old brcm-2.6 port, close #1312, #1451 
SVN-Revision: 6564
 2007-03-14 03:37:40 +00:00
Felix Fietkau
a44c286fdb nuke mdev and replace it with hotplug2 :) 
SVN-Revision: 6512
 2007-03-04 20:31:53 +00:00
Imre Kaloz
662fde9077 R.I.P. devfs 
SVN-Revision: 6478
 2007-03-03 20:35:01 +00:00
Felix Fietkau
68ca8e7818 make squashfs overlay support more generic and integrate it for x86-2.6 
SVN-Revision: 6450
 2007-03-02 01:23:36 +00:00
Felix Fietkau
a256c81dd9 move mtd rootfs split patch to generic-2.6, disabled for broadcom targets until the flash map driver is updated and tested 
SVN-Revision: 6449
 2007-03-01 23:52:19 +00:00
Felix Fietkau
4273579814 add a patch to revert recent breakage in the intel cfi flash driver (fixes #1140) 
SVN-Revision: 6420
 2007-02-28 01:14:42 +00:00
Felix Fietkau
d064080013 update to imq patch version 2.6.19-imq3 - fixes kernel oops from #1397 
SVN-Revision: 6418
 2007-02-28 00:53:20 +00:00
Felix Fietkau
c6a4f047e3 correct wrong CONFIG_PCMCIA defaults (fixes buildbot errors) 
SVN-Revision: 6390
 2007-02-26 14:36:27 +00:00
Felix Fietkau
912e5867ef Finally fix the pesky x86-2.6 block2mtd related crash (#1058) When erasing blocks, block2mtd checks the block on the physical disk to see if everything's filled with 0xff. When grabbing a page from the page cache, it initializes the limit as <start address> + PAGE_SIZE. Turns out that the pointer to the status page is (unsigned long *), and thus it adds (PAGE_SIZE * 4). This would never have been caught, if it wasn't for the unlikely event that block2mtd catches the *last* page available in the system ram and thus tries to scan 4 memory pages from there. The absolutely trivial fix is to do a double cast (cast to (u8 *), add PAGE_SIZE, then cast to (unsigned long *)) 
... and there was much rejoicing

SVN-Revision: 6318
 2007-02-18 13:52:14 +00:00
Felix Fietkau
b7f6521923 add fix for kernel headers to allow offsetof access from user space 
SVN-Revision: 6299
 2007-02-14 02:42:08 +00:00
Felix Fietkau
01910ee69d move tlb change for mips 4KC to generic patches (required for most mips targets) 
SVN-Revision: 6294
 2007-02-13 00:55:11 +00:00
Felix Fietkau
8e88bb54ba port [6229] to kamikaze 
SVN-Revision: 6275
 2007-02-08 01:25:18 +00:00
Felix Fietkau
b4bd264899 add extra netfilter xt stuff to config-template 
SVN-Revision: 6264
 2007-02-04 21:15:46 +00:00
Felix Fietkau
286cfe3c61 disable block2mtd page readahead (patch from #1058) 
SVN-Revision: 6242
 2007-02-01 21:35:25 +00:00
Felix Fietkau
1668e52b8b forward port missing parts of the mtd permission change in whiterussian (and add it to linux 2.6 as well) 
SVN-Revision: 6224
 2007-01-27 19:22:15 +00:00
Florian Fainelli
acf6ec373e Add chaostable from #1187, also enable netfilter modules for ixp4xx. 
SVN-Revision: 6182
 2007-01-22 23:55:22 +00:00
Imre Kaloz
d82a8a3da0 fix kernel compile on real operating systems :P (closes #1150) 
SVN-Revision: 5997
 2007-01-05 19:47:31 +00:00
Florian Fainelli
3fc2a24f04 Add an OSX specific patch to make the kernel be compiled 
SVN-Revision: 5987
 2007-01-05 15:29:54 +00:00
Felix Fietkau
9052cff7c9 reorder netfilter patches, update layer7 kernel to latest version, should improve stability 
SVN-Revision: 5950
 2007-01-01 04:42:50 +00:00
Felix Fietkau
f9d5bdd6f3 add compatibility patch for d80211 
SVN-Revision: 5937
 2006-12-30 17:52:58 +00:00
Florian Fainelli
79a3d66cde Replace inode.u.generic_ip with inode.i_private 
SVN-Revision: 5848
 2006-12-18 21:57:24 +00:00
Rod Whitby
b29cb380f4 Renamed 050-* to comply with patch naming convention. 
SVN-Revision: 5814
 2006-12-17 12:28:46 +00:00
Rod Whitby
b3dcce7d75 Replaced non-working (on NAS100d) redboot byteswap partition truncate patch with the one that has been tested on NSLU2, NAS100d, Loft, etc., accepted by linux-mtd, and should be in 2.6.20 
SVN-Revision: 5813
 2006-12-17 03:05:52 +00:00
Felix Fietkau
bff468813f Upgrade to Linux 2.6.19 
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1

SVN-Revision: 5789
 2006-12-14 16:41:33 +00:00
Felix Fietkau
1ce8e3192b fix uclibc compile 
SVN-Revision: 5734
 2006-12-09 10:38:11 +00:00
Felix Fietkau
227817a3c6 more compile fixes 
SVN-Revision: 5730
 2006-12-08 22:02:44 +00:00
Felix Fietkau
3264c50c3a fix up include/linux/types.h for user space stuff (patch from debian), fixes #1008 
SVN-Revision: 5724
 2006-12-08 15:58:15 +00:00
Mike Baker
c3c4dfb57b move target/image/platform to target/linux/platform/image platform directories are now self contained 
SVN-Revision: 5669
 2006-11-28 20:14:41 +00:00
Felix Fietkau
4dc43d9b48 mini_fo fixes 
SVN-Revision: 5556
 2006-11-17 15:58:58 +00:00
Felix Fietkau
9f9ac067a4 add mini_fo 
SVN-Revision: 5541
 2006-11-17 02:50:09 +00:00
Imre Kaloz
93ab44d5d6 add redboot parsing and rtl8169 fixes, enable r8169 and add the free ixp4xx ethernet driver - the later still needs fixes and testing for the gateway 7001 
SVN-Revision: 5311
 2006-10-27 12:32:10 +00:00
Felix Fietkau
28a3cb3ca3 add fix for samsung flash chips 
SVN-Revision: 5284
 2006-10-24 18:05:05 +00:00
Nicolas Thill
273a22b336 add missing <asm/segment.h>, fix mini_fo and openswan build on ppc 
SVN-Revision: 5206
 2006-10-18 14:16:17 +00:00
Felix Fietkau
60c1f0f64d finally move buildroot-ng to trunk 2016-03-20 17:29:15 +01:00