Merge branch 'master' of git+ssh://openadk.org/git/openadk

58 files changed, 8 insertions, 8 deletions

diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index b43a566b9..d3f988845 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -36,16 +36,16 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
-	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_30
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_84
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_34
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_13
-	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_6
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_14
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_7
 
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_4_82
+	depends on ADK_KERNEL_VERSION_3_4_84
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
@@ -54,10 +54,10 @@ config ADK_KPACKAGE_KMOD_NF_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_10_30 \
+	depends on ADK_KERNEL_VERSION_3_10_34 \
 		|| ADK_KERNEL_VERSION_3_11_10 \
-		|| ADK_KERNEL_VERSION_3_12_13 \
-		|| ADK_KERNEL_VERSION_3_13_6
+		|| ADK_KERNEL_VERSION_3_12_14 \
+		|| ADK_KERNEL_VERSION_3_13_7
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
diff --git a/target/linux/patches/3.10.33/bsd-compatibility.patch b/target/linux/patches/3.10.34/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.10.33/bsd-compatibility.patch
+++ b/target/linux/patches/3.10.34/bsd-compatibility.patch
diff --git a/target/linux/patches/3.10.33/startup.patch b/target/linux/patches/3.10.34/startup.patch
index 3ebc5db1e..3ebc5db1e 100644
--- a/target/linux/patches/3.10.33/startup.patch
+++ b/target/linux/patches/3.10.34/startup.patch
diff --git a/target/linux/patches/3.12.13/bsd-compatibility.patch b/target/linux/patches/3.12.14/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.12.13/bsd-compatibility.patch
+++ b/target/linux/patches/3.12.14/bsd-compatibility.patch
diff --git a/target/linux/patches/3.12.13/defaults.patch b/target/linux/patches/3.12.14/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.12.13/defaults.patch
+++ b/target/linux/patches/3.12.14/defaults.patch
diff --git a/target/linux/patches/3.12.13/disable-netfilter.patch b/target/linux/patches/3.12.14/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.12.13/disable-netfilter.patch
+++ b/target/linux/patches/3.12.14/disable-netfilter.patch
diff --git a/target/linux/patches/3.12.13/export-symbol-for-exmap.patch b/target/linux/patches/3.12.14/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.12.13/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.12.14/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.12.13/gemalto.patch b/target/linux/patches/3.12.14/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.12.13/gemalto.patch
+++ b/target/linux/patches/3.12.14/gemalto.patch
diff --git a/target/linux/patches/3.12.13/lemote-rfkill.patch b/target/linux/patches/3.12.14/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.12.13/lemote-rfkill.patch
+++ b/target/linux/patches/3.12.14/lemote-rfkill.patch
diff --git a/target/linux/patches/3.12.13/microblaze-ethernet.patch b/target/linux/patches/3.12.14/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.12.13/microblaze-ethernet.patch
+++ b/target/linux/patches/3.12.14/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.12.13/microblaze-setup.patch b/target/linux/patches/3.12.14/microblaze-setup.patch
index 43815f274..43815f274 100644
--- a/target/linux/patches/3.12.13/microblaze-setup.patch
+++ b/target/linux/patches/3.12.14/microblaze-setup.patch
diff --git a/target/linux/patches/3.12.13/mips-lzo-fix.patch b/target/linux/patches/3.12.14/mips-lzo-fix.patch
index 0740bdc6a..0740bdc6a 100644
--- a/target/linux/patches/3.12.13/mips-lzo-fix.patch
+++ b/target/linux/patches/3.12.14/mips-lzo-fix.patch
diff --git a/target/linux/patches/3.12.13/mtd-rootfs.patch b/target/linux/patches/3.12.14/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.12.13/mtd-rootfs.patch
+++ b/target/linux/patches/3.12.14/mtd-rootfs.patch
diff --git a/target/linux/patches/3.12.13/non-static.patch b/target/linux/patches/3.12.14/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.12.13/non-static.patch
+++ b/target/linux/patches/3.12.14/non-static.patch
diff --git a/target/linux/patches/3.12.13/ppc64-missing-zlib.patch b/target/linux/patches/3.12.14/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.12.13/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.12.14/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.12.13/raspberry.patch b/target/linux/patches/3.12.14/raspberry.patch
index c306f4faf..c306f4faf 100644
--- a/target/linux/patches/3.12.13/raspberry.patch
+++ b/target/linux/patches/3.12.14/raspberry.patch
diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.14/startup.patch
index 4cd477da1..4cd477da1 100644
--- a/target/linux/patches/3.12.13/startup.patch
+++ b/target/linux/patches/3.12.14/startup.patch
diff --git a/target/linux/patches/3.12.13/usb-defaults-off.patch b/target/linux/patches/3.12.14/usb-defaults-off.patch
index 54dff2bd4..54dff2bd4 100644
--- a/target/linux/patches/3.12.13/usb-defaults-off.patch
+++ b/target/linux/patches/3.12.14/usb-defaults-off.patch
diff --git a/target/linux/patches/3.12.13/uuid.patch b/target/linux/patches/3.12.14/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.12.13/uuid.patch
+++ b/target/linux/patches/3.12.14/uuid.patch
diff --git a/target/linux/patches/3.12.13/vga-cons-default-off.patch b/target/linux/patches/3.12.14/vga-cons-default-off.patch
index 08a57f783..08a57f783 100644
--- a/target/linux/patches/3.12.13/vga-cons-default-off.patch
+++ b/target/linux/patches/3.12.14/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.12.13/wlan-cf.patch b/target/linux/patches/3.12.14/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.12.13/wlan-cf.patch
+++ b/target/linux/patches/3.12.14/wlan-cf.patch
diff --git a/target/linux/patches/3.12.13/xargs.patch b/target/linux/patches/3.12.14/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.12.13/xargs.patch
+++ b/target/linux/patches/3.12.14/xargs.patch
diff --git a/target/linux/patches/3.12.13/zlib-inflate.patch b/target/linux/patches/3.12.14/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.12.13/zlib-inflate.patch
+++ b/target/linux/patches/3.12.14/zlib-inflate.patch
diff --git a/target/linux/patches/3.13.6/bsd-compatibility.patch b/target/linux/patches/3.13.7/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.13.6/bsd-compatibility.patch
+++ b/target/linux/patches/3.13.7/bsd-compatibility.patch
diff --git a/target/linux/patches/3.13.6/defaults.patch b/target/linux/patches/3.13.7/defaults.patch
index 6cdca084e..6cdca084e 100644
--- a/target/linux/patches/3.13.6/defaults.patch
+++ b/target/linux/patches/3.13.7/defaults.patch
diff --git a/target/linux/patches/3.13.6/disable-netfilter.patch b/target/linux/patches/3.13.7/disable-netfilter.patch
index 7b1ca013a..7b1ca013a 100644
--- a/target/linux/patches/3.13.6/disable-netfilter.patch
+++ b/target/linux/patches/3.13.7/disable-netfilter.patch
diff --git a/target/linux/patches/3.13.6/export-symbol-for-exmap.patch b/target/linux/patches/3.13.7/export-symbol-for-exmap.patch
index 4f0fc8449..4f0fc8449 100644
--- a/target/linux/patches/3.13.6/export-symbol-for-exmap.patch
+++ b/target/linux/patches/3.13.7/export-symbol-for-exmap.patch
diff --git a/target/linux/patches/3.13.6/gemalto.patch b/target/linux/patches/3.13.7/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.13.6/gemalto.patch
+++ b/target/linux/patches/3.13.7/gemalto.patch
diff --git a/target/linux/patches/3.13.6/lemote-rfkill.patch b/target/linux/patches/3.13.7/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.13.6/lemote-rfkill.patch
+++ b/target/linux/patches/3.13.7/lemote-rfkill.patch
diff --git a/target/linux/patches/3.13.6/microblaze-axi.patch b/target/linux/patches/3.13.7/microblaze-axi.patch
index 1a4b17d8c..1a4b17d8c 100644
--- a/target/linux/patches/3.13.6/microblaze-axi.patch
+++ b/target/linux/patches/3.13.7/microblaze-axi.patch
diff --git a/target/linux/patches/3.13.6/microblaze-early-printk.patch b/target/linux/patches/3.13.7/microblaze-early-printk.patch
index 92027cea1..92027cea1 100644
--- a/target/linux/patches/3.13.6/microblaze-early-printk.patch
+++ b/target/linux/patches/3.13.7/microblaze-early-printk.patch
diff --git a/target/linux/patches/3.13.6/microblaze-ethernet.patch b/target/linux/patches/3.13.7/microblaze-ethernet.patch
index 742ab477e..742ab477e 100644
--- a/target/linux/patches/3.13.6/microblaze-ethernet.patch
+++ b/target/linux/patches/3.13.7/microblaze-ethernet.patch
diff --git a/target/linux/patches/3.13.6/microblaze-setup.patch b/target/linux/patches/3.13.7/microblaze-setup.patch
index 43815f274..43815f274 100644
--- a/target/linux/patches/3.13.6/microblaze-setup.patch
+++ b/target/linux/patches/3.13.7/microblaze-setup.patch
diff --git a/target/linux/patches/3.13.6/mtd-rootfs.patch b/target/linux/patches/3.13.7/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.13.6/mtd-rootfs.patch
+++ b/target/linux/patches/3.13.7/mtd-rootfs.patch
diff --git a/target/linux/patches/3.13.6/non-static.patch b/target/linux/patches/3.13.7/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.13.6/non-static.patch
+++ b/target/linux/patches/3.13.7/non-static.patch
diff --git a/target/linux/patches/3.13.6/ppc64-missing-zlib.patch b/target/linux/patches/3.13.7/ppc64-missing-zlib.patch
index c6e0616be..c6e0616be 100644
--- a/target/linux/patches/3.13.6/ppc64-missing-zlib.patch
+++ b/target/linux/patches/3.13.7/ppc64-missing-zlib.patch
diff --git a/target/linux/patches/3.13.6/ppc64-missing_arch_random.patch b/target/linux/patches/3.13.7/ppc64-missing_arch_random.patch
index b341a7be5..b341a7be5 100644
--- a/target/linux/patches/3.13.6/ppc64-missing_arch_random.patch
+++ b/target/linux/patches/3.13.7/ppc64-missing_arch_random.patch
diff --git a/target/linux/patches/3.13.6/raspberry.patch b/target/linux/patches/3.13.7/raspberry.patch
index 1e2050a44..1e2050a44 100644
--- a/target/linux/patches/3.13.6/raspberry.patch
+++ b/target/linux/patches/3.13.7/raspberry.patch
diff --git a/target/linux/patches/3.13.6/startup.patch b/target/linux/patches/3.13.7/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/3.13.6/startup.patch
+++ b/target/linux/patches/3.13.7/startup.patch
diff --git a/target/linux/patches/3.13.6/uuid.patch b/target/linux/patches/3.13.7/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.13.6/uuid.patch
+++ b/target/linux/patches/3.13.7/uuid.patch
diff --git a/target/linux/patches/3.13.6/vga-cons-default-off.patch b/target/linux/patches/3.13.7/vga-cons-default-off.patch
index 08a57f783..08a57f783 100644
--- a/target/linux/patches/3.13.6/vga-cons-default-off.patch
+++ b/target/linux/patches/3.13.7/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.13.6/wlan-cf.patch b/target/linux/patches/3.13.7/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.13.6/wlan-cf.patch
+++ b/target/linux/patches/3.13.7/wlan-cf.patch
diff --git a/target/linux/patches/3.13.6/xargs.patch b/target/linux/patches/3.13.7/xargs.patch
index 2c7b3df59..2c7b3df59 100644
--- a/target/linux/patches/3.13.6/xargs.patch
+++ b/target/linux/patches/3.13.7/xargs.patch
diff --git a/target/linux/patches/3.13.6/zlib-inflate.patch b/target/linux/patches/3.13.7/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.13.6/zlib-inflate.patch
+++ b/target/linux/patches/3.13.7/zlib-inflate.patch
diff --git a/target/linux/patches/3.4.82/bsd-compatibility.patch b/target/linux/patches/3.4.84/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.82/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.84/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.82/defaults.patch b/target/linux/patches/3.4.84/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.82/defaults.patch
+++ b/target/linux/patches/3.4.84/defaults.patch
diff --git a/target/linux/patches/3.4.82/gemalto.patch b/target/linux/patches/3.4.84/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.82/gemalto.patch
+++ b/target/linux/patches/3.4.84/gemalto.patch
diff --git a/target/linux/patches/3.4.82/lemote-rfkill.patch b/target/linux/patches/3.4.84/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.82/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.84/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.82/mips-error.patch b/target/linux/patches/3.4.84/mips-error.patch
index 800abc80d..800abc80d 100644
--- a/target/linux/patches/3.4.82/mips-error.patch
+++ b/target/linux/patches/3.4.84/mips-error.patch
diff --git a/target/linux/patches/3.4.82/module-alloc-size-check.patch b/target/linux/patches/3.4.84/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.82/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.84/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.82/non-static.patch b/target/linux/patches/3.4.84/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.82/non-static.patch
+++ b/target/linux/patches/3.4.84/non-static.patch
diff --git a/target/linux/patches/3.4.82/sparc-include.patch b/target/linux/patches/3.4.84/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.82/sparc-include.patch
+++ b/target/linux/patches/3.4.84/sparc-include.patch
diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.84/startup.patch
index c26430bcb..c26430bcb 100644
--- a/target/linux/patches/3.4.82/startup.patch
+++ b/target/linux/patches/3.4.84/startup.patch
diff --git a/target/linux/patches/3.4.82/usb-defaults-off.patch b/target/linux/patches/3.4.84/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.82/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.84/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.82/uuid.patch b/target/linux/patches/3.4.84/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.82/uuid.patch
+++ b/target/linux/patches/3.4.84/uuid.patch
diff --git a/target/linux/patches/3.4.82/vga-cons-default-off.patch b/target/linux/patches/3.4.84/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.82/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.84/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.82/wlan-cf.patch b/target/linux/patches/3.4.84/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.82/wlan-cf.patch
+++ b/target/linux/patches/3.4.84/wlan-cf.patch
diff --git a/target/linux/patches/3.4.82/zlib-inflate.patch b/target/linux/patches/3.4.84/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.82/zlib-inflate.patch
+++ b/target/linux/patches/3.4.84/zlib-inflate.patch