Merge branch 'master' into next

Conflicts:
	board/esd/plu405/plu405.c
	drivers/rtc/ftrtc010.c

Signed-off-by: Wolfgang Denk <wd@denx.de>

lib_ppc/Makefile

@@ -35,7 +35,7 @@ COBJS-y	+= bootm.o
 COBJS-y	+= cache.o
 COBJS-y	+= extable.o
 COBJS-y	+= interrupts.o
-COBJS-y	+= kgdb.o
+COBJS-$(CONFIG_CMD_KGDB) += kgdb.o
 COBJS-y	+= time.o
 
 SRCS	:= $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)

lib_ppc/kgdb.c

@@ -1,8 +1,5 @@
 #include <common.h>
 #include <command.h>
-
-#if defined(CONFIG_CMD_KGDB)
-
 #include <kgdb.h>
 #include <asm/signal.h>
 #include <asm/processor.h>
@@ -322,5 +319,3 @@ kgdb_breakpoint(int argc, char *argv[])
 	     breakinst: .long 0x7d821008\n\
 	    ");
 }
-
-#endif