Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel...

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index 738f404d5e34fab2ea30ccecc7861486765f9a80,0b0cf0d2872f66b15aad4ebdff80b75e30750f1a..4e829c604f93e97736860a4fe567e892061b4ed5
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1392,18 -1374,12 +1392,24 @@@ config UACCESS_WITH_MEMCP
          However, if the CPU data cache is using a write-allocate mode,
          this option is unlikely to provide any performance gain.
  
 +config CC_STACKPROTECTOR
 +      bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
 +      help
 +        This option turns on the -fstack-protector GCC feature. This
 +        feature puts, at the beginning of functions, a canary value on
 +        the stack just before the return address, and validates
 +        the value just before actually returning.  Stack based buffer
 +        overflows (that need to overwrite this return address) now also
 +        overwrite the canary, which gets detected and the attack is then
 +        neutralized via a kernel panic.
 +        This feature requires gcc version 4.2 or above.
 +
+ config DEPRECATED_PARAM_STRUCT
+       bool "Provide old way to pass kernel parameters"
+       help
+         This was deprecated in 2001 and announced to live on for 5 years.
+         Some old boot loaders still use this way.
+ 
  endmenu
  
  menu "Boot options"