tree b1f13074a64765bf774af78df34603d96750281f
parent 20dba4596fd768b2d9154e3258871ebdd2c9fa29
parent 06c0dd72aea3985d0ea036f771ebb1d1083bf69f
author Linus Torvalds <torvalds@linux-foundation.org> 1269473813 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269473813 -0700

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] fix boot failures with compressed kernels
  [S390] fix broken proc interface for sclp_async
  [S390] sclp: avoid 64 bit division
  [S390] dasd: check tsb validity
  [S390] dasd: fix alignment of transport mode recovery TCW
  [S390] system.h: Fix compile error for 1 and 2 byte cmpxchg
  [S390] smp: fix lowcore allocation
  [S390] zcore: CPU registers are not saved under LPAR