From 96c1bdd20974f1a7da3a9caeb639efa933db039d Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Thu, 6 Dec 2012 11:13:27 +0400
Subject: [PATCH] nickolay-842 kernel config updated.

---
 .config.nickolay-842 | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.config.nickolay-842 b/.config.nickolay-842
index 3426d6d..7a3675f 100644
--- a/.config.nickolay-842
+++ b/.config.nickolay-842
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.5-pf Kernel Configuration
+# Linux/x86_64 3.6.10-pf Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -256,12 +256,11 @@ CONFIG_BLOCK_COMPAT=y
 #
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_IOSCHED_BFQ=y
-# CONFIG_CGROUP_BFQIO is not set
-CONFIG_DEFAULT_BFQ=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_IOSCHED_BFQ is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="bfq"
+CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_PREEMPT_NOTIFIERS=y
 # CONFIG_INLINE_SPIN_TRYLOCK is not set
 # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
@@ -409,10 +408,10 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_EFI is not set
 CONFIG_SECCOMP=y
 # CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_HZ_100=y
+# CONFIG_HZ_100 is not set
 # CONFIG_HZ_250_NODEFAULT is not set
 # CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
+CONFIG_HZ_1000=y
 # CONFIG_HZ_1500 is not set
 # CONFIG_HZ_2000 is not set
 # CONFIG_HZ_3000 is not set
@@ -420,7 +419,7 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_5000 is not set
 # CONFIG_HZ_7500 is not set
 # CONFIG_HZ_10000 is not set
-CONFIG_HZ=100
+CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
@@ -440,7 +439,7 @@ CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION="/dev/sda9"
+CONFIG_PM_STD_PARTITION=""
 CONFIG_TOI_CORE=y
 
 #
@@ -2279,11 +2278,11 @@ CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 CONFIG_IO_DELAY_TYPE_NONE=3
-# CONFIG_IO_DELAY_0X80 is not set
+CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_UDELAY is not set
-CONFIG_IO_DELAY_NONE=y
-CONFIG_DEFAULT_IO_DELAY_TYPE=3
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_OPTIMIZE_INLINING is not set
 
 #
@@ -2423,7 +2422,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KVM_INTEL=y
 # CONFIG_KVM_AMD is not set
-# CONFIG_VHOST_NET is not set
+CONFIG_VHOST_NET=y
 # CONFIG_BINARY_PRINTF is not set
 
 #