From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Dec 2009 00:58:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.33-rc1~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support
  NOMMU: Optimise away the {dac_,}mmap_min_addr tests
  security/min_addr.c: make init_mmap_min_addr() static
  keys: PTR_ERR return of wrong pointer in keyctl_get_security()
---

efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa