From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 7 May 2010 13:52:18 +0000 (+0300)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux... 
X-Git-Tag: Release-2010-05/1~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=3a6c2f8305acbad93fb5c527abb1872f365caddf

Merge branch 'master' of git://git./linux/kernel/git/stable/linux-2.6.27.y into pandora-27-omap1_rework

Conflicts:
	drivers/usb/musb/davinci.c
	security/Kconfig
---

3a6c2f8305acbad93fb5c527abb1872f365caddf
diff --cc drivers/usb/musb/davinci.c
index 217f4978e50b,dfb3bcbe00fc..4e97d5323e2b
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@@ -30,10 -30,11 +30,11 @@@
  #include <linux/delay.h>
  #include <linux/clk.h>
  #include <linux/io.h>
+ #include <linux/gpio.h>
  
 -#include <asm/arch/hardware.h>
 -#include <asm/arch/memory.h>
 -#include <asm/arch/gpio.h>
 +#include <mach/hardware.h>
 +#include <mach/gpio.h>
 +#include <asm/memory.h>
  #include <asm/mach-types.h>
  
  #include "musb_core.h"
diff --cc security/Kconfig
index 811f00270546,38411dddfea1..cc5c70c223a4
--- a/security/Kconfig
+++ b/security/Kconfig
@@@ -92,36 -92,8 +92,37 @@@ config SECURITY_ROOTPLU
  
  	  See <http://www.linuxjournal.com/article.php?sid=6279> for
  	  more information about this module.
 +	  
 +	  If you are unsure how to answer this question, answer N.
 +
 +config SECURITY_LOWMEM
 +	tristate "Low memory watermark support"
 +	depends on SECURITY
 +	help
 +	  Implements low memory watermark support
 +
 +	  If you are unsure how to answer this question, answer N.
 +
 +config SECURITY_DEFAULT_MMAP_MIN_ADDR
 +        int "Low address space to protect from user allocation"
 +        depends on SECURITY
 +        default 0
 +        help
 +	  This is the portion of low virtual memory which should be protected
 +	  from userspace allocation.  Keeping a user from writing to low pages
 +	  can help reduce the impact of kernel NULL pointer bugs.
 +
 +	  For most ia64, ppc64 and x86 users with lots of address space
 +	  a value of 65536 is reasonable and should cause no problems.
 +	  On arm and other archs it should not be higher than 32768.
 +	  Programs which use vm86 functionality would either need additional
 +	  permissions from either the LSM or the capabilities module or have
 +	  this protection disabled.
 +
 +	  This value can be changed after boot using the
 +	  /proc/sys/vm/mmap_min_addr tunable.
  
+ 	  If you are unsure how to answer this question, answer N.
  
  source security/selinux/Kconfig
  source security/smack/Kconfig