tree 4bf35b974326f1f17de4ea3d17b65aa44811da01
parent 7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b
parent 51120c2cc70fc241721b8016f4eff575e7d6aa30
author Linus Torvalds <torvalds@linux-foundation.org> 1295023646 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295023646 -0800

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/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