core/linux-kirkwood to 3.11.1

2025-03-19 00:21:40 +00:00 · 2013-09-15 21:17:12 -06:00 · 2013-09-15 21:17:12 -06:00 · 6f67ef27d5
commit 6f67ef27d5
parent b27cb36e78
4 changed files with 442 additions and 232 deletions
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@ -7,11 +7,14 @@ pkgbase=linux-kirkwood
 pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
 #pkgname=linux-test       # Build kernel with a different name
 _kernelname=${pkgname#linux}
-_basekernel=3.10.10
+_basekernel=3.11.1
 pkgver=${_basekernel}
-pkgrel=2
+pkgrel=1
 cryptover=1.6
 bfqver=v6r2
+uksmver="0.1.2.2"
+uksmname="v3.10"
+
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@ -24,27 +27,29 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
        'change-default-console-loglevel.patch'
        'usb-add-reset-resume-quirk-for-several-webcams.patch'
        "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
+	"http://kerneldedup.org/download/uksm/${uksmver}/uksm-${uksmver}-for-${uksmname}.patch"
 	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-4).patch"
 	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch"
-	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch"
-	"0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch")
+	"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch")

-md5sums=('647f76225dd6bc112369ba573ba3de18'
-         'b608eac5d7d8fdac4d62412a8b4f6bf7'
-         'ec13d33d2d51ef47c530fd26e6955922'
+md5sums=('466c042aa58d4839396443bf4438fdc5'
+         '738377b860fcb83fb653cfb8bf03265d'
+         '0484f0f6355e46332d888362564fe413'
         'SKIP'
-         '80b2fb500e6811495c6b072d7e6fd112'
+         '65d5a4f313310bb2a732d022d51ea7e7'
         '9b5a265440abf57d2052838f31486a3a'
         'eade38998313c25fd7934719cdf8a2ea'
-         'f1a179be96469b27c21d114b55b521cb'
-         'a929da16edbd480d7d8f90a15eb8a548'
-         'b9e7cbbb21bbe08a4baea9f7e8bc8083'
-	 'ae3c4e30dc31f33abf7897c2a842f130')
+	 '4089a51c706f1ca00acfc55829b4dffb'
+         '0f8ad72666ad5e94b50df49f79d36021'
+         'c92242aebf31b636ba897f95aa7a0179'
+         'dcd7dba7d106429f05446e5f906efcbb')

 build() {
 msg "Patches"
 msg2 "Getting aufs3 patches and copying into the kernel source tree"
  git clone --branch aufs$(echo $_basekernel |cut -c 1-4) --depth=1 git://git.code.sf.net/p/aufs/aufs3-standalone
+  ### Use the line below only for rc kernels.
+  #git clone --branch aufs3.x-rcN --depth=1 git://git.code.sf.net/p/aufs/aufs3-standalone

  cp -ru "${srcdir}/aufs3-standalone/Documentation" "${srcdir}/linux-${_basekernel}/"
  cp -ru "${srcdir}/aufs3-standalone/fs" "${srcdir}/linux-${_basekernel}/"
@ -68,11 +73,13 @@ msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
  patch -Np1 -i "${srcdir}/archlinuxarm.patch"
  cp "${srcdir}/mach-types" arch/arm/tools

+msg2 "Add UKSM patch"
+  patch -Np1 -i "${srcdir}/uksm-${uksmver}-for-${uksmname}.patch"
+
 msg2 "Add BFQ patches"
  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-4).patch"
  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch"
  patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch"  
-  patch -Np1 -i "${srcdir}/0001-block-Switch-from-BFQ-v6r2-for-3.10.0-to-BFQ-v6r2-fo.patch"

  # add latest fixes from stable queue, if needed
  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
--- a/core/linux-kirkwood/archlinuxarm.patch
+++ b/core/linux-kirkwood/archlinuxarm.patch
@ -1,88 +1,6 @@
-diff -ruN a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi	1969-12-31 17:00:00.000000000 -0700
-@@ -1,78 +0,0 @@
-/include/ "kirkwood.dtsi"
-
-/ {
-	model = "QNAP TS219 family";
-	compatible = "qnap,ts219", "marvell,kirkwood";
-
-	memory {
-		device_type = "memory";
-		reg = <0x00000000 0x20000000>;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,115200n8";
-	};
-
-	ocp@f1000000 {
-		i2c@11000 {
-			status = "okay";
-			clock-frequency = <400000>;
-
-			s35390a: s35390a@30 {
-				compatible = "s35390a";
-				reg = <0x30>;
-			};
-		};
-		serial@12000 {
-			clock-frequency = <200000000>;
-			status = "okay";
-		};
-		serial@12100 {
-			clock-frequency = <200000000>;
-			status = "okay";
-		};
-		spi@10600 {
-			status = "okay";
-
-			m25p128@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				compatible = "m25p128";
-				reg = <0>;
-				spi-max-frequency = <20000000>;
-				mode = <0>;
-
-				partition@0000000 {
-					reg = <0x00000000 0x00080000>;
-					label = "U-Boot";
-				};
-
-				partition@00200000 {
-					reg = <0x00200000 0x00200000>;
-					label = "Kernel";
-				};
-
-				partition@00400000 {
-					reg = <0x00400000 0x00900000>;
-					label = "RootFS1";
-				};
-				partition@00d00000 {
-					reg = <0x00d00000 0x00300000>;
-					label = "RootFS2";
-				};
-				partition@00040000 {
-					reg = <0x00080000 0x00040000>;
-					label = "U-Boot Config";
-				};
-				partition@000c0000 {
-					reg = <0x000c0000 0x00140000>;
-					label = "NAS Config";
-				};
-			};
-		};
-		sata@80000 {
-			status = "okay";
-			nr-ports = <2>;
-		};
-	};
-};
 diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c
 --- a/arch/arm/mach-kirkwood/bubba3-gpio.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2013-09-06 05:02:11.765210478 -0600
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2013-09-07 00:15:20.242275253 -0600
@@ -0,0 +1,392 @@
 +/*
 + * Excito BUBBA|3 led driver.
@ -478,7 +396,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
 +module_exit(bubba3_cleanup);
 diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c
 --- a/arch/arm/mach-kirkwood/bubba3-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2013-09-06 04:59:48.925126133 -0600
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2013-09-07 00:15:20.242275253 -0600
@@ -0,0 +1,234 @@
 +/*
 + * arch/arm/mach-kirkwood/bubba3-setup.c
@ -715,9 +633,9 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba
 +        .restart        = kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
--- a/arch/arm/mach-kirkwood/common.h	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/common.h	2013-09-06 04:59:48.935128810 -0600
-@@ -77,12 +77,6 @@
+--- a/arch/arm/mach-kirkwood/common.h	2013-09-02 14:46:10.000000000 -0600
+++ b/arch/arm/mach-kirkwood/common.h	2013-09-07 00:15:20.252274282 -0600
+@@ -86,12 +86,6 @@
 static inline void dnskw_init(void) {};
 #endif
 
@ -730,7 +648,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 #ifdef CONFIG_MACH_IB62X0_DT
 void ib62x0_init(void);
 #else
-@@ -95,12 +89,6 @@
+@@ -104,12 +98,6 @@
 static inline void dockstar_dt_init(void) {};
 #endif
 
@ -744,8 +662,8 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 void lsxl_init(void);
 #else
 diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2013-09-06 04:59:48.935128810 -0600
+--- a/arch/arm/mach-kirkwood/dockstar-setup.c	2013-09-02 14:46:10.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2013-09-07 00:15:20.262273642 -0600
@@ -28,6 +28,10 @@
 		.offset = 0,
 		.size = SZ_1M
@ -791,7 +709,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
 
 diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
 --- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2013-09-06 04:59:48.935128810 -0600
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2013-09-07 00:15:20.262273642 -0600
@@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -919,7 +837,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2013-09-06 04:59:48.945131365 -0600
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2013-09-07 00:15:20.262273642 -0600
@@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -1099,9 +1017,55 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +MACHINE_END
 +
 diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2013-09-06 04:59:48.945131365 -0600
-@@ -59,22 +59,24 @@
+--- a/arch/arm/mach-kirkwood/guruplug-setup.c	2013-09-11 23:18:35.000000000 -0500
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2013-09-11 23:25:24.000000000 -0500
+@@ -16,6 +16,8 @@
+ #include <linux/mv643xx_eth.h>
+ #include <linux/gpio.h>
+ #include <linux/leds.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/spi.h>
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+ #include <mach/kirkwood.h>
+@@ -23,6 +25,36 @@
+ #include "common.h"
+ #include "mpp.h"
+ 
+static struct mtd_partition dreamplug_partitions[] = {
+	{
+		.name	= "u-boot",
+		.size	= SZ_512K,
+		.offset	= 0,
+	}, {
+		.name	= "u-boot env",
+		.size	= SZ_64K,
+		.offset	= SZ_512K + SZ_512K,
+	},
+};
+
+static const struct flash_platform_data dreamplug_spi_slave_data = {
+	.type		= "mx25l1606e",
+	.name		= "spi_flash",
+	.parts		= dreamplug_partitions,
+	.nr_parts	= ARRAY_SIZE(dreamplug_partitions),
+};
+
+static struct spi_board_info __initdata dreamplug_spi_slave_info[] = {
+	{
+		.modalias	= "m25p80",
+		.platform_data	= &dreamplug_spi_slave_data,
+		.irq		= -1,
+		.max_speed_hz	= 50000000,
+		.bus_num	= 0,
+		.chip_select	= 0,
+	},
+};
+
+ static struct mtd_partition guruplug_nand_parts[] = {
+ 	{
+ 		.name = "u-boot",
+@@ -59,22 +91,24 @@
 
 static struct gpio_led guruplug_led_pins[] = {
 	{
@ -1130,9 +1094,102 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
 		.gpio			= 49,
 		.active_low		= 1,
 	},
+@@ -93,6 +127,41 @@
+ 	}
+ };
+ 
+static struct gpio_led dreamplug_led_pins[] = {
+	{
+		.name			= "status:blue:bt",
+		.gpio			= 47,
+		.active_low		= 1,
+	},
+	{
+		.name			= "status:green:wifi",
+		.gpio			= 48,
+		.active_low		= 1,
+	},
+	{
+		.name			= "status:blue:ap",
+		.gpio			= 49,
+		.active_low		= 1,
+	},
+};
+
+static struct gpio_led_platform_data dreamplug_led_data = {
+	.leds		= dreamplug_led_pins,
+	.num_leds	= ARRAY_SIZE(dreamplug_led_pins),
+};
+
+static unsigned int dreamplug_mpp_config[] __initdata = {
+	MPP0_SPI_SCn,
+	MPP1_SPI_MOSI,
+	MPP2_SPI_SCK,
+	MPP3_SPI_MISO,
+	MPP47_GPIO,	/* Bluetooth LED */
+	MPP48_GPIO,	/* Wifi LED */
+	MPP49_GPIO,	/* Wifi AP LED */
+	0
+};
+
+
+ static unsigned int guruplug_mpp_config[] __initdata = {
+ 	MPP46_GPIO,	/* M_RLED */
+ 	MPP47_GPIO,	/* M_GLED */
+@@ -107,10 +176,21 @@
+ 	 * Basic setup. Needs to be called early.
+ 	 */
+ 	kirkwood_init();
+-	kirkwood_mpp_conf(guruplug_mpp_config);
+ 
+-	kirkwood_uart0_init();
+-	kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25);
+	if (machine_is_guruplug()) {
+		kirkwood_mpp_conf(guruplug_mpp_config);
+		kirkwood_uart0_init();
+		kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25);
+	}
+
+	if (machine_is_dreamplug()) {
+		kirkwood_mpp_conf(dreamplug_mpp_config);
+		kirkwood_uart0_init();
+		spi_register_board_info(dreamplug_spi_slave_info,
+				ARRAY_SIZE(dreamplug_spi_slave_info));
+		kirkwood_spi_init();
+		guruplug_leds.dev.platform_data = &dreamplug_led_data;
+	}
+ 
+ 	kirkwood_ehci_init();
+ 	kirkwood_ge00_init(&guruplug_ge00_data);
+@@ -121,6 +201,7 @@
+ 	platform_device_register(&guruplug_leds);
+ }
+ 
+#ifdef CONFIG_MACH_GURUPLUG
+ MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board")
+ 	/* Maintainer: Siddarth Gore <gores@marvell.com> */
+ 	.atag_offset	= 0x100,
+@@ -131,3 +212,17 @@
+ 	.init_time	= kirkwood_timer_init,
+ 	.restart	= kirkwood_restart,
+ MACHINE_END
+#endif
+
+#ifdef CONFIG_MACH_DREAMPLUG
+MACHINE_START(DREAMPLUG, "Marvell DreamPlug Reference Board")
+	/* Maintainer: ? */
+        .atag_offset    = 0x100,
+        .init_machine   = guruplug_init,
+        .map_io         = kirkwood_map_io,
+        .init_early     = kirkwood_init_early,
+        .init_irq       = kirkwood_init_irq,
+        .init_time      = kirkwood_timer_init,
+        .restart        = kirkwood_restart,
+MACHINE_END
+#endif
 diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
 --- a/arch/arm/mach-kirkwood/iconnect-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2013-09-06 04:59:48.945131365 -0600
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2013-09-07 00:15:20.272273037 -0600
@@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@ -1340,7 +1397,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
 --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2013-09-06 04:59:48.945131365 -0600
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2013-09-07 00:15:20.272273037 -0600
@@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -1480,9 +1537,22 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/Kconfig	2013-09-06 04:59:48.955133836 -0600
-@@ -92,6 +92,12 @@
+--- a/arch/arm/mach-kirkwood/Kconfig	2013-09-02 14:46:10.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig	2013-09-10 02:32:30.313992267 -0600
+@@ -26,6 +26,12 @@
+ 	  Say 'Y' here if you want your kernel to support the
+ 	  Marvell GuruPlug Reference Board.
+ 
+config MACH_DREAMPLUG
+	bool "Marvell DreamPlug Reference Board"
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  Marvell DreamPlug Reference Board.
+
+ config MACH_INETSPACE_V2
+ 	bool "LaCie Internet Space v2 NAS Board"
+ 	help
+@@ -86,6 +92,12 @@
 	  Say 'Y' here if you want your kernel to support the
 	  Marvell OpenRD Ultimate Board.
 
@ -1495,7 +1565,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 config MACH_RD88F6192_NAS
 	bool "Marvell RD-88F6192-NAS Reference Board"
 	help
-@@ -130,6 +136,66 @@
+@@ -124,6 +136,66 @@
 	  QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
 	  NAS devices.
 
@ -1562,7 +1632,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 comment "Device tree entries"
 
 config ARCH_KIRKWOOD_DT
-@@ -161,13 +227,6 @@
+@@ -161,13 +233,6 @@
 	  Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
 	  using Flattened Device Tree.
 
@ -1576,7 +1646,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 config MACH_DREAMPLUG_DT
 	bool "Marvell DreamPlug (Flattened Device Tree)"
 	select ARCH_KIRKWOOD_DT
-@@ -175,13 +234,6 @@
+@@ -175,13 +240,6 @@
 	  Say 'Y' here if you want your kernel to support the
 	  Marvell DreamPlug (Flattened Device Tree).
 
@ -1590,7 +1660,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 config MACH_GURUPLUG_DT
 	bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"
 	select ARCH_KIRKWOOD_DT
-@@ -197,12 +249,6 @@
+@@ -197,12 +255,6 @@
 	  RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
 	  Flattened Device Tree.
 
@ -1603,7 +1673,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 config MACH_INETSPACE_V2_DT
 	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
 	select ARCH_KIRKWOOD_DT
-@@ -303,20 +349,6 @@
+@@ -303,21 +355,6 @@
 	  Say 'Y' here if you want your kernel to support the
 	  USI Topkick, using Flattened Device Tree
 
@ -1612,6 +1682,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 -	select ARCH_KIRKWOOD_DT
 -	select ARM_APPENDED_DTB
 -	select ARM_ATAG_DTB_COMPAT
+-	select POWER_RESET_QNAP
 -	help
 -	  Say 'Y' here if you want your kernel to support the QNAP
 -	  TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
@ -1625,26 +1696,35 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 
 endif
 diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/Makefile	2013-09-06 04:59:48.955133836 -0600
-@@ -18,16 +18,25 @@
+--- a/arch/arm/mach-kirkwood/Makefile	2013-09-02 14:46:10.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile	2013-09-10 02:33:17.173140672 -0600
+@@ -4,6 +4,7 @@
+ obj-$(CONFIG_MACH_DOCKSTAR)		+= dockstar-setup.o
+ obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
+ obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
+obj-$(CONFIG_MACH_DREAMPLUG)		+= guruplug-setup.o
+ obj-$(CONFIG_MACH_INETSPACE_V2)		+= netspace_v2-setup.o lacie_v2-common.o
+ obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o
+ obj-$(CONFIG_MACH_NET2BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
+@@ -17,6 +18,17 @@
 obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o
 obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
 obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
-+obj-$(CONFIG_MACH_GOFLEXNET)		+= goflexnet-setup.o
-+obj-$(CONFIG_MACH_GOFLEXHOME)		+= goflexhome-setup.o
-+obj-$(CONFIG_MACH_ICONNECT)		+= iconnect-setup.o
-+obj-$(CONFIG_MACH_POGOPLUGV4)		+= pogoplugv4-setup.o
-+obj-$(CONFIG_MACH_POGO_E02)		+= pogo_e02-setup.o
-+obj-$(CONFIG_MACH_NAS6210)		+= nas6210-setup.o
-+obj-$(CONFIG_MACH_TOPKICK)		+= topkick-setup.o
-+obj-$(CONFIG_MACH_IONICS_STRATUS)	+= ionics-stratus-setup.o
+obj-$(CONFIG_MACH_GOFLEXNET)            += goflexnet-setup.o
+obj-$(CONFIG_MACH_GOFLEXHOME)           += goflexhome-setup.o
+obj-$(CONFIG_MACH_ICONNECT)             += iconnect-setup.o
+obj-$(CONFIG_MACH_POGOPLUGV4)           += pogoplugv4-setup.o
+obj-$(CONFIG_MACH_POGO_E02)             += pogo_e02-setup.o
+obj-$(CONFIG_MACH_NAS6210)              += nas6210-setup.o
+obj-$(CONFIG_MACH_TOPKICK)              += topkick-setup.o
+obj-$(CONFIG_MACH_IONICS_STRATUS)       += ionics-stratus-setup.o
 +obj-$(CONFIG_MACH_BUBBA3)               += bubba3-setup.o bubba3-gpio.o
-+obj-$(CONFIG_MACH_NSA310)		+= nsa310-setup.o
-+obj-$(CONFIG_MACH_NSA320)		+= nsa320-setup.o
+obj-$(CONFIG_MACH_NSA310)               += nsa310-setup.o
+obj-$(CONFIG_MACH_NSA320)               += nsa320-setup.o
 
 obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o
 obj-$(CONFIG_MACH_CLOUDBOX_DT)		+= board-ns2.o
+@@ -24,10 +36,8 @@
 obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)	+= board-dnskw.o
 obj-$(CONFIG_MACH_DOCKSTAR_DT)		+= board-dockstar.o
 obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o
@ -1655,18 +1735,14 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
-@@ -37,8 +46,6 @@
- obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o
- obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)	+= board-ns2.o
- obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
-obj-$(CONFIG_MACH_NSA310_DT)		+= board-nsa310.o
- obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o
+@@ -41,4 +51,3 @@
 obj-$(CONFIG_MACH_READYNAS_DT)		+= board-readynas.o
+ obj-$(CONFIG_MACH_SHEEVAPLUG_DT)	+= board-sheevaplug.o
 obj-$(CONFIG_MACH_TOPKICK_DT)		+= board-usi_topkick.o
 -obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o
 diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
 --- a/arch/arm/mach-kirkwood/nas6210-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2013-09-06 04:59:48.955133836 -0600
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2013-09-07 00:15:20.282272762 -0600
@@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@ -1856,7 +1932,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
 --- a/arch/arm/mach-kirkwood/nsa310-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2013-09-06 04:59:48.965136025 -0600
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2013-09-07 00:15:20.292272610 -0600
@@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@ -2219,7 +2295,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
 --- a/arch/arm/mach-kirkwood/nsa320-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2013-09-06 04:59:48.965136025 -0600
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2013-09-07 00:15:20.292272610 -0600
@@ -0,0 +1,305 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@ -2528,7 +2604,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
 --- a/arch/arm/mach-kirkwood/pogo_e02-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2013-09-06 04:59:48.965136025 -0600
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2013-09-07 00:15:20.292272610 -0600
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -2647,7 +2723,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
 --- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2013-09-06 04:59:48.975138092 -0600
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2013-09-07 00:15:20.292272610 -0600
@@ -0,0 +1,195 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -2845,8 +2921,8 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2013-09-06 04:59:48.975138092 -0600
+--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2013-09-02 14:46:10.000000000 -0600
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2013-09-07 00:15:20.302272754 -0600
@@ -43,7 +43,7 @@
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
 };
@ -2930,7 +3006,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
 
 diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
 --- a/arch/arm/mach-kirkwood/topkick-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2013-09-06 04:59:48.975138092 -0600
+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2013-09-07 00:15:20.302272754 -0600
@@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@ -3098,8 +3174,8 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
 +	.restart	= kirkwood_restart,
 +MACHINE_END
 diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
--- a/arch/arm/plat-orion/common.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/arch/arm/plat-orion/common.c	2013-09-06 04:59:48.995141858 -0600
+--- a/arch/arm/plat-orion/common.c	2013-09-02 14:46:10.000000000 -0600
+++ b/arch/arm/plat-orion/common.c	2013-09-07 00:15:20.312272775 -0600
@@ -256,7 +256,9 @@
 /*****************************************************************************
  * GE00
@ -3112,8 +3188,8 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
 static struct resource orion_ge00_shared_resources[] = {
 	{
 diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/ata/sata_mv.c	2013-09-06 04:59:49.025146634 -0600
+--- a/drivers/ata/sata_mv.c	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/ata/sata_mv.c	2013-09-07 00:15:20.322272610 -0600
@@ -71,6 +71,7 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@ -3132,9 +3208,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
 		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
 		if (want_ncq != using_ncq)
 diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/hwmon/Kconfig	2013-09-06 04:59:49.045149344 -0600
-@@ -1528,6 +1528,19 @@
+--- a/drivers/hwmon/Kconfig	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/hwmon/Kconfig	2013-09-07 00:15:20.332272397 -0600
+@@ -1543,6 +1543,19 @@
         help
           Support for the A/D converter on MC13783 and MC13892 PMIC.
 
@ -3155,9 +3231,9 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
 
 comment "ACPI drivers"
 diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/hwmon/Makefile	2013-09-06 04:59:49.075154509 -0600
-@@ -107,6 +107,7 @@
+--- a/drivers/hwmon/Makefile	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/hwmon/Makefile	2013-09-07 00:15:20.342272161 -0600
+@@ -108,6 +108,7 @@
 obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
 obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o
 obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
@ -3167,7 +3243,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
 obj-$(CONFIG_SENSORS_NTC_THERMISTOR)	+= ntc_thermistor.o
 diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 --- a/drivers/hwmon/nsa3xx-hwmon.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/drivers/hwmon/nsa3xx-hwmon.c	2013-09-06 04:59:49.075154509 -0600
+++ b/drivers/hwmon/nsa3xx-hwmon.c	2013-09-07 00:15:20.342272161 -0600
@@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@ -3421,8 +3497,8 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:nsa3xx-hwmon");
 diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
--- a/drivers/leds/trigger/Kconfig	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/leds/trigger/Kconfig	2013-09-06 04:59:49.105159319 -0600
+--- a/drivers/leds/trigger/Kconfig	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/leds/trigger/Kconfig	2013-09-07 00:15:20.352271939 -0600
@@ -35,7 +35,6 @@
 
 config LEDS_TRIGGER_IDE_DISK
@ -3432,9 +3508,9 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
 	help
 	  This allows LEDs to be controlled by IDE disk activity.
 diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/mmc/core/core.c	2013-09-06 04:59:49.115160531 -0600
-@@ -785,7 +785,7 @@
+--- a/drivers/mmc/core/core.c	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/mmc/core/core.c	2013-09-07 00:15:20.352271939 -0600
+@@ -804,7 +804,7 @@
 			 */
 			limit_us = 3000000;
 		else
@ -3444,8 +3520,8 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
 		/*
 		 * SDHC cards always use these fixed values.
 diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/mmc/core/sd.c	2013-09-06 04:59:49.125161658 -0600
+--- a/drivers/mmc/core/sd.c	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/mmc/core/sd.c	2013-09-07 00:15:20.362271734 -0600
@@ -355,6 +355,15 @@
 		return -ENOMEM;
 	}
@ -3463,8 +3539,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
 	if (err)
 		goto out;
 diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c	2013-08-29 10:47:51.000000000 -0600
-+++ b/drivers/mmc/host/mvsdio.c	2013-09-06 04:59:49.145163157 -0600
+--- a/drivers/mmc/host/mvsdio.c	2013-09-02 14:46:10.000000000 -0600
+++ b/drivers/mmc/host/mvsdio.c	2013-09-07 00:15:20.362271734 -0600
@@ -25,6 +25,7 @@
 #include <linux/of_irq.h>
 #include <linux/mmc/host.h>
@ -3483,7 +3559,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
 
 diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 --- a/include/linux/bubba3.h	1969-12-31 17:00:00.000000000 -0700
-+++ b/include/linux/bubba3.h	2013-09-06 04:59:49.155164153 -0600
+++ b/include/linux/bubba3.h	2013-09-07 00:15:20.372271543 -0600
@@ -0,0 +1,41 @@
 +/*
 + * (C) Copyright 2010
@ -3528,7 +3604,7 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 +#endif
 diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
 --- a/include/linux/nsa3xx-hwmon.h	1969-12-31 17:00:00.000000000 -0700
-+++ b/include/linux/nsa3xx-hwmon.h	2013-09-06 04:59:49.155164153 -0600
+++ b/include/linux/nsa3xx-hwmon.h	2013-09-07 00:15:20.372271543 -0600
@@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h
--- a/core/linux-kirkwood/change-default-console-loglevel.patch
+++ b/core/linux-kirkwood/change-default-console-loglevel.patch
@ -1,6 +1,6 @@
 diff -ruN a/kernel/printk.c b/kernel/printk.c
--- a/kernel/printk.c	2013-05-07 21:58:03.000000000 -0600
-+++ b/kernel/printk.c	2013-05-08 23:24:39.000000000 -0600
+--- a/kernel/printk/printk.c	2013-05-07 21:58:03.000000000 -0600
+++ b/kernel/printk/printk.c	2013-05-08 23:24:39.000000000 -0600
@@ -61,7 +61,7 @@
 
 /* We show everything that is MORE important than this.. */
--- a/core/linux-kirkwood/config
+++ b/core/linux-kirkwood/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.9-4 Kernel Configuration
+# Linux/arm 3.11.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -10,6 +10,7 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
@ -26,16 +27,19 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-ARCH"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@ -87,15 +91,19 @@ CONFIG_TASK_IO_ACCOUNTING=y
 #
 # RCU Subsystem
 #
-# CONFIG_TREE_PREEMPT_RCU is not set
-CONFIG_TINY_PREEMPT_RCU=y
+CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_BOOST is not set
+# CONFIG_RCU_NOCB_CPU is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
+CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_FREEZER=y
@ -128,11 +136,11 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
-CONFIG_HOTPLUG=y
 # CONFIG_EXPERT is not set
 CONFIG_UID16=y
 # CONFIG_SYSCTL_SYSCALL is not set
@ -164,6 +172,7 @@ CONFIG_SLUB_DEBUG=y
 CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_PROFILING=y
 CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
@ -220,6 +229,7 @@ CONFIG_BLK_DEV_BSGLIB=y
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@ -294,7 +304,6 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_EXYNOS is not set
 # CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP1 is not set
 # CONFIG_GPIO_PCA953X is not set
@ -304,10 +313,10 @@ CONFIG_ARCH_KIRKWOOD=y
 # Marvell Kirkwood Implementations
 #
 CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_DB88F6281_BP=y
 CONFIG_MACH_DOCKSTAR=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
+CONFIG_MACH_DREAMPLUG=y
 CONFIG_MACH_INETSPACE_V2=y
 CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_NET2BIG_V2=y
@ -341,6 +350,7 @@ CONFIG_MACH_NSA320=y
 #
 # CONFIG_ARCH_KIRKWOOD_DT is not set
 # CONFIG_MACH_CLOUDBOX_DT is not set
+# CONFIG_MACH_DB88F628X_BP_DT is not set
 # CONFIG_MACH_DLINK_KIRKWOOD_DT is not set
 # CONFIG_MACH_DREAMPLUG_DT is not set
 # CONFIG_MACH_GURUPLUG_DT is not set
@ -354,11 +364,23 @@ CONFIG_MACH_NSA320=y
 # CONFIG_MACH_NETSPACE_MAX_V2_DT is not set
 # CONFIG_MACH_NETSPACE_MINI_V2_DT is not set
 # CONFIG_MACH_NETSPACE_V2_DT is not set
-# CONFIG_MACH_NSA310_DT is not set
 # CONFIG_MACH_OPENBLOCKS_A6_DT is not set
 # CONFIG_MACH_READYNAS_DT is not set
+# CONFIG_MACH_SHEEVAPLUG_DT is not set
 # CONFIG_MACH_TOPKICK_DT is not set
 # CONFIG_PLAT_SPEAR is not set
+
+#
+# ST-Ericsson AB U300/U335 Platform
+#
+
+#
+# ST-Ericsson Mobile Platform Products
+#
+
+#
+# ST-Ericsson U300/U335 Feature Selections
+#
 CONFIG_PLAT_ORION=y
 CONFIG_PLAT_ORION_LEGACY=y

@ -404,6 +426,12 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
 # CONFIG_PCI_PASID is not set
+
+#
+# PCI host controller drivers
+#
+# CONFIG_PCI_MVEBU is not set
+# CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCCARD is not set

 #
@ -438,11 +466,14 @@ CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_KSM=y
+CONFIG_UKSM=y
+# CONFIG_KSM_LEGACY is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_NEED_PER_CPU_KM=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_FRONTSWAP is not set
+# CONFIG_ZBUD is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
@ -467,6 +498,32 @@ CONFIG_ATAGS_PROC=y
 #
 # CPU Power Management
 #
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#
+# ARM CPU frequency scaling drivers
+#
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
@ -502,6 +559,7 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_APM_EMULATION is not set
 CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_CPU_PM=y
 # CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_NET=y
@ -814,7 +872,6 @@ CONFIG_BRIDGE_EBT_NFLOG=m
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
@ -919,7 +976,9 @@ CONFIG_DNS_RESOLVER=y
 CONFIG_VSOCKETS=m
 # CONFIG_NETLINK_MMAP is not set
 # CONFIG_NETLINK_DIAG is not set
+# CONFIG_NET_MPLS_GSO is not set
 # CONFIG_NETPRIO_CGROUP is not set
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 # CONFIG_BPF_JIT is not set

@ -1101,6 +1160,7 @@ CONFIG_DMA_SHARED_BUFFER=y
 # Bus devices
 #
 CONFIG_MVEBU_MBUS=y
+# CONFIG_ARM_CCI is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@ -1243,7 +1303,6 @@ CONFIG_AD525X_DPOT=m
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_DUMMY_IRQ is not set
 CONFIG_PHANTOM=m
-# CONFIG_INTEL_MID_PTI is not set
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@ -1417,6 +1476,7 @@ CONFIG_ATA_BMDMA=y
 CONFIG_SATA_MV=y
 # CONFIG_SATA_NV is not set
 # CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_RCAR is not set
 # CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIS is not set
 # CONFIG_SATA_SVW is not set
@ -1510,6 +1570,7 @@ CONFIG_DM_MULTIPATH_ST=m
 # CONFIG_DM_UEVENT is not set
 # CONFIG_DM_FLAKEY is not set
 # CONFIG_DM_VERITY is not set
+# CONFIG_DM_SWITCH is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@ -1531,12 +1592,12 @@ CONFIG_I2O_EXT_ADAPTEC=y
 # CONFIG_I2O_SCSI is not set
 # CONFIG_I2O_PROC is not set
 CONFIG_NETDEVICES=y
+CONFIG_MII=y
 CONFIG_NET_CORE=y
 # CONFIG_BONDING is not set
 # CONFIG_DUMMY is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_NET_FC is not set
-CONFIG_MII=y
 # CONFIG_IFB is not set
 # CONFIG_NET_TEAM is not set
 CONFIG_MACVLAN=m
@ -1548,6 +1609,7 @@ CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
 CONFIG_VETH=m
+# CONFIG_NLMON is not set
 # CONFIG_ARCNET is not set

 #
@ -1578,6 +1640,7 @@ CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_PCNET32 is not set
+CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 # CONFIG_ATL2 is not set
 # CONFIG_ATL1 is not set
@ -1658,7 +1721,6 @@ CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_NVIDIA=y
 # CONFIG_FORCEDETH is not set
 CONFIG_NET_VENDOR_OKI=y
-CONFIG_PCH_GBE=y
 # CONFIG_ETHOC is not set
 CONFIG_NET_PACKET_ENGINE=y
 # CONFIG_HAMACHI is not set
@ -1672,6 +1734,7 @@ CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 CONFIG_R8169=y
+# CONFIG_SH_ETH is not set
 CONFIG_NET_VENDOR_RDC=y
 # CONFIG_R6040 is not set
 CONFIG_NET_VENDOR_SEEQ=y
@ -1831,6 +1894,12 @@ CONFIG_ATH6KL_USB=m
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_ATH10K=m
+# CONFIG_ATH10K_PCI is not set
+# CONFIG_ATH10K_DEBUG is not set
+# CONFIG_ATH10K_DEBUGFS is not set
+# CONFIG_ATH10K_TRACING is not set
 CONFIG_B43=m
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
@ -1912,14 +1981,17 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_RTLWIFI=m
-CONFIG_RTLWIFI_DEBUG=y
+CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+CONFIG_RTLWIFI_DEBUG=y
 CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL_TI is not set
 CONFIG_ZD1211RW=m
@ -1928,6 +2000,7 @@ CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 # CONFIG_MWIFIEX_PCIE is not set
 # CONFIG_MWIFIEX_USB is not set
+# CONFIG_CW1200 is not set

 #
 # WiMAX Wireless Broadband devices
@ -1944,7 +2017,7 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 #
 CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
-# CONFIG_INPUT_POLLDEV is not set
+CONFIG_INPUT_POLLDEV=m
 # CONFIG_INPUT_SPARSEKMAP is not set
 # CONFIG_INPUT_MATRIXKMAP is not set

@ -2021,6 +2094,7 @@ CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
+# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 # CONFIG_TOUCHSCREEN_EETI is not set
@ -2133,6 +2207,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@ -2179,7 +2254,6 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_INTEL_MID is not set
 CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@ -2227,11 +2301,6 @@ CONFIG_SPI_ORION=y
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
 # CONFIG_HSI is not set

 #
@ -2259,7 +2328,6 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PTP_1588_CLOCK_PCH=y
 CONFIG_PINCTRL=y

 #
@ -2268,7 +2336,6 @@ CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
-# CONFIG_PINCTRL_EXYNOS5440 is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_KIRKWOOD=y
 CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
@ -2404,6 +2471,7 @@ CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_GPIO_FAN is not set
@ -2492,7 +2560,12 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_FAIR_SHARE is not set
 CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
+# CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@ -2506,6 +2579,7 @@ CONFIG_ORION_WATCHDOG=y
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_I6300ESB_WDT is not set
+# CONFIG_MEN_A21_WDT is not set

 #
 # PCI-based Watchdog Cards
@ -2555,6 +2629,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
@ -2585,6 +2660,7 @@ CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_VEXPRESS_CONFIG is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m

@ -2705,6 +2781,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 # CONFIG_USB_SN9C102 is not set
+CONFIG_VIDEO_USBTV=m

 #
 # Analog TV USB devices
@ -2829,6 +2906,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_TIMBERDALE=m
 CONFIG_SOC_CAMERA=m
+CONFIG_SOC_CAMERA_SCALE_CROP=m
 CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_VIDEO_SH_MOBILE_CSI2=m
 CONFIG_VIDEO_SH_MOBILE_CEU=m
@ -3183,9 +3261,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=m
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=m
 # CONFIG_SOUND_OSS_CORE is not set
@ -3231,6 +3306,7 @@ CONFIG_SND_USB_UA101=m
 CONFIG_SND_USB_CAIAQ=m
 # CONFIG_SND_USB_CAIAQ_INPUT is not set
 # CONFIG_SND_USB_6FIRE is not set
+CONFIG_SND_USB_HIFACE=m
 # CONFIG_SND_SOC is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
@ -3261,9 +3337,11 @@ CONFIG_HID_DRAGONRISE=m
 # CONFIG_DRAGONRISE_FF is not set
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
+# CONFIG_HID_ELO is not set
 CONFIG_HID_EZKEY=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HOLTEK_FF=y
+# CONFIG_HID_HUION is not set
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
 CONFIG_HID_UCLOGIC=m
@ -3296,7 +3374,6 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 # CONFIG_HID_PRIMAX is not set
-CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
 # CONFIG_HID_SAITEK is not set
 CONFIG_HID_SAMSUNG=m
@ -3315,7 +3392,6 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
@ -3332,9 +3408,6 @@ CONFIG_USB_HIDDEV=y
 # I2C HID support
 #
 # CONFIG_I2C_HID is not set
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
@ -3368,6 +3441,7 @@ CONFIG_USB_EHCI_HCD_ORION=y
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_FUSBH200_HCD is not set
 # CONFIG_USB_OHCI_HCD is not set
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_SL811_HCD is not set
@ -3487,6 +3561,8 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_ZTE=m
 # CONFIG_USB_SERIAL_SSU100 is not set
 # CONFIG_USB_SERIAL_QT2 is not set
+# CONFIG_USB_SERIAL_FLASHLOADER is not set
+# CONFIG_USB_SERIAL_SUUNTO is not set
 CONFIG_USB_SERIAL_DEBUG=m

 #
@ -3519,7 +3595,6 @@ CONFIG_USB_PHY=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_OMAP_CONTROL_USB is not set
 # CONFIG_OMAP_USB3 is not set
-# CONFIG_SAMSUNG_USBPHY is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
 # CONFIG_USB_GPIO_VBUS is not set
@ -3597,7 +3672,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
-# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

@ -3637,6 +3712,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF2127 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
 CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_PCF8583 is not set
@ -3697,7 +3773,9 @@ CONFIG_DMADEVICES=y
 # DMA Devices
 #
 CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
+# CONFIG_DW_DMAC_CORE is not set
 # CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
 CONFIG_MV_XOR=y
 CONFIG_TIMB_DMA=m
 CONFIG_DMA_ENGINE=y
@ -3798,7 +3876,6 @@ CONFIG_USB_SERIAL_QUATECH2=m
 # Digital gyroscope sensors
 #
 # CONFIG_ADIS16060 is not set
-# CONFIG_ADIS16130 is not set
 # CONFIG_ADIS16260 is not set

 #
@ -3863,12 +3940,12 @@ CONFIG_FB_XGI=m
 # CONFIG_ANDROID is not set
 CONFIG_USB_WPAN_HCD=m
 # CONFIG_WIMAX_GDM72XX is not set
-CONFIG_CSR_WIFI=m
 CONFIG_NET_VENDOR_SILICOM=y
 # CONFIG_SBYPASS is not set
 # CONFIG_BPCTL is not set
 # CONFIG_CED1401 is not set
 # CONFIG_DGRP is not set
+CONFIG_USB_BTMTK=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@ -3877,6 +3954,7 @@ CONFIG_COMMON_CLK=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_DEBUG is not set
+# CONFIG_COMMON_CLK_SI5351 is not set

 #
 # Hardware Spinlock drivers
@ -3918,6 +3996,7 @@ CONFIG_IIO=m
 # CONFIG_AD7476 is not set
 # CONFIG_AD7887 is not set
 # CONFIG_MAX1363 is not set
+# CONFIG_MCP320X is not set
 # CONFIG_TI_ADC081C is not set

 #
@ -3947,6 +4026,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_AD5764 is not set
 # CONFIG_AD5791 is not set
 # CONFIG_AD5686 is not set
+# CONFIG_AD7303 is not set
 # CONFIG_MAX517 is not set
 # CONFIG_MCP4725 is not set

@ -3968,6 +4048,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # Digital gyroscope sensors
 #
 # CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
 # CONFIG_ADIS16136 is not set
 # CONFIG_ADXRS450 is not set
 # CONFIG_HID_SENSOR_GYRO_3D is not set
@ -3995,10 +4076,16 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 # CONFIG_AK8975 is not set
 # CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
 # CONFIG_IIO_ST_MAGN_3AXIS is not set
+
+#
+# Pressure Sensors
+#
+# CONFIG_IIO_ST_PRESS is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
+# CONFIG_FMC is not set

 #
 # File systems
@ -4195,6 +4282,7 @@ CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4_SECURITY_LABEL is not set
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@ -4275,59 +4363,82 @@ CONFIG_NLS_UTF8=y
 #
 # Kernel hacking
 #
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_LOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set

 #
 # RCU Debugging
@ -4335,16 +4446,14 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_PROVE_RCU_DELAY is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_LKDTM is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@ -4376,17 +4485,24 @@ CONFIG_KPROBE_EVENT=y
 CONFIG_PROBE_EVENTS=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-# CONFIG_TEST_STRING_HELPERS is not set
-# CONFIG_TEST_KSTRTOX is not set
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
@ -4483,7 +4599,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
-# CONFIG_CRYPTO_CMAC is not set
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@ -4537,6 +4653,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m

 #
 # Random Number Generation
@ -4557,6 +4675,7 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IO=y
 CONFIG_CRC_CCITT=y
@ -4577,6 +4696,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@ -4591,6 +4713,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@ -4607,4 +4730,8 @@ CONFIG_AVERAGE=y
 # CONFIG_CORDIC is not set
 # CONFIG_DDR is not set
 CONFIG_OID_REGISTRY=m
+CONFIG_FONT_SUPPORT=m
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 # CONFIG_VIRTUALIZATION is not set