Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
	Makefile

diff --cc drivers/mtd/nand/nand_bbt.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sys.c
index 61dfac580989a550124054bbc00e32642772ecc4,dd29555462c35398d897f0f9a76f2d5af2742526..1f4f15c409876253f9e8d49bda08fcc0d18045e1
--- 1/kernel/sys.c
--- 2/kernel/sys.c
+++ b/kernel/sys.c
@@@ -345,12 -333,8 +345,13 @@@ void kernel_restart_prepare(char *cmd
   */
  void kernel_restart(char *cmd)
  {
 +      /*
 +      *  debug trace
 +      */
 +      restart_dbg("%s->%d->cmd=%s",__FUNCTION__,__LINE__,cmd);
 +      
        kernel_restart_prepare(cmd);
+       disable_nonboot_cpus();
        if (!cmd)
                printk(KERN_EMERG "Restarting system.\n");
        else

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc scripts/Kbuild.include
Simple merge