tree b730cd35a1bde5f2ddd85e080a6269df96c50074
parent 451688ba0b488faf274e13dc591734b1e695642c
parent 6252d702c5311ce916caf75ed82e5c8245171c92
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1202584523 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1202584523 -0800

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

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] dynamic page tables.
  [S390] Add four level page tables for CONFIG_64BIT=y.
  [S390] 1K/2K page table pages.
  [S390] Remove a.out header file.
  [S390] sclp_vt220: Fix vt220 initialization
  [S390] qdio: avoid hang when establishing qdio queues
  [S390] VMEM_MAX_PHYS overflow on 31 bit.
  [S390] zcrypt: Do not start ap poll thread per default
  [S390] Fix __ffs_word_loop/__ffz_word_loop inlnie assembly.
  [S390] Wire up new timerfd syscalls.
  [S390] Update default configuration.