tree cc51209ce3065a10850481cdc18c6376130146aa
parent e3aa51fecdc941c859ed0515084323d3f997aa4a
parent 0066ed55a9a061ed64bbc09c16f45daf0b976ac5
author Linus Torvalds <torvalds@linux-foundation.org> 1212158659 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1212158659 -0700

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] Update default configuration.
  [S390] disassembler: fix idte instruction format.
  [S390] tape: fix race with stack local wait_queue_head_t.
  [S390] 3270: fix race with stack local wait_queue_head_t.
  [S390] dasd: use a generic wait_queue for sleep_on
  [S390] sclp_vt220: fix scheduling while atomic bug.
  [S390] showmem: Only walk spanned pages.
  [S390] appldata: prevent cpu hotplug when walking cpu_online_map.
  [S390] Fix section mismatch warnings.
  [S390] s390 types: make dma_addr_t 64 bit capable
  [S390] tape: Fix race condition in tape block device driver
  [S390] fix sparsemem related compile error with allnoconfig on s390