From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 16:47:26 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.38-rc1~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] MAINTAINERS: Update zcrypt driver entry
  [S390] Randomize PIEs
  [S390] Randomise the brk region
  [S390] Add is_32bit_task() helper function
  [S390] Randomize lower bits of stack address
  [S390] Randomize mmap start address
  [S390] Rearrange mmap.c
  [S390] Enable flexible mmap layout for 64 bit processes
  [S390] vdso: dont map at mmap_base
  [S390] reduce miminum gap between stack and mmap_base
  [S390] mmap: consider stack address randomization
  [S390] Update default configuration
  [S390] cio: path_event overindication after resume
---

c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4