merge to 2.6.37-git1

build_kernel.sh

@@ -186,6 +186,7 @@ function make_headers {
 if [ -e ${DIR}/system.sh ]; then
 	. system.sh
 	. version.sh
+if [ "-${LINUX_GIT}-" != "--" ]; then
 
 if [ "${IS_LUCID}" ] ; then
 	echo ""

patches/defconfig

 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.37 Kernel Configuration
-# Thu Jan  6 12:30:44 2011
+# Linux/arm 2.6.37-git1 Kernel Configuration
+# Fri Jan  7 13:55:02 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -69,6 +69,7 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_SRCU_SYNCHRONIZE_DELAY=10
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_CGROUPS=y
@@ -92,6 +93,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
@@ -3558,6 +3560,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y

patches/no_devtmps-defconfig

 #
 # Automatically generated make config: don't edit
-# Linux/arm 2.6.37 Kernel Configuration
-# Thu Jan  6 12:30:44 2011
+# Linux/arm 2.6.37-git1 Kernel Configuration
+# Fri Jan  7 13:55:02 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -69,6 +69,7 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_SRCU_SYNCHRONIZE_DELAY=10
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_CGROUPS=y
@@ -92,6 +93,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
 CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
@@ -3557,6 +3559,7 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y

version.sh

@@ -4,7 +4,7 @@ unset BUILD
 
 KERNEL_REL=2.6.37
 #STABLE_PATCH=.1
-#PRE_RC=2.6.36-git17
+PRE_RC=2.6.37-git1
 #RC_KERNEL=2.6.37
 #RC_PATCH=-rc8
 ABI=0