Merge branch 'next'

Conflicts:
	toolchain/kernel-headers/Config.in

diff --cc package/mtd/mtd.mk
Simple merge

diff --cc toolchain/kernel-headers/Config.in
index 12535313f5591ddcbb3554d23074b1f9effc42b7,b3fb362d01e5be6a186cdd8fd192a57a72683231..17fe7978c459ec95764b2dd992a39359ec2c7210
--- 1/toolchain/kernel-headers/Config.in
--- 2/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@@ -63,9 -64,10 +64,10 @@@ config BR2_DEFAULT_KERNEL_HEADER
        default "2.6.37.6"      if BR2_KERNEL_HEADERS_2_6_37
        default "2.6.38.8"      if BR2_KERNEL_HEADERS_2_6_38
        default "2.6.39.4"      if BR2_KERNEL_HEADERS_2_6_39
 -      default "3.0.31"        if BR2_KERNEL_HEADERS_3_0
 +      default "3.0.32"        if BR2_KERNEL_HEADERS_3_0
        default "3.1.10"        if BR2_KERNEL_HEADERS_3_1
 -      default "3.2.16"        if BR2_KERNEL_HEADERS_3_2
 -      default "3.3.5"         if BR2_KERNEL_HEADERS_3_3
 +      default "3.2.18"        if BR2_KERNEL_HEADERS_3_2
 +      default "3.3.7"         if BR2_KERNEL_HEADERS_3_3
+       default "3.4"           if BR2_KERNEL_HEADERS_3_4
        default "2.6"           if BR2_KERNEL_HEADERS_SNAP
        default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION