Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
	arch/m68k/Kconfig.debug

diff --cc arch/m68k/Kconfig.debug
index a0c8863bd08b481bdfa27280756a578d41d947a3,af4fd5f8f8d5c9852359a47f9657bf32c395a2f9..9d4008fee6d80e9a04f022fa2cf8e078df7a366d
--- 1/arch/m68k/Kconfig.debug
--- 2/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@@ -2,17 -2,14 +2,25 @@@ menu "Kernel hacking
  
  source "lib/Kconfig.debug"
  
 +config EARLY_PRINTK
 +      bool "Early printk" if EMBEDDED
 +      depends on MVME16x || MAC
 +      default y
 +      help
 +          Write kernel log output directly to a serial port.
 +
 +          This is useful for kernel debugging when your machine crashes very
 +          early before the console code is initialized.
 +          You should normally say N here, unless you want to debug such a crash.
 +
+ config BOOTPARAM
+       bool 'Compiled-in Kernel Boot Parameter'
+ 
+ config BOOTPARAM_STRING
+       string 'Kernel Boot Parameter'
+       default 'console=ttyS0,19200'
+       depends on BOOTPARAM
+ 
  if !MMU
  
  config FULLDEBUG