commit 19f2b8dfea10e4d5cd34feb08cbab738504c25cf
author Linus Torvalds <torvalds@linux-foundation.org> Tue Jun 10 08:00:40 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jun 10 08:00:40 2008 -0700
tree 095707c7fee30c9112f34967916da638674c2805
parent c592713b3e124ce0719e6af4bc2520424c49cbae
parent 1783e60ff207805a3e75cf522b17ec9bb1604a62

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] tape_3590.c: introduce missing kfree
  [S390] Fix __ctl_load/__ctl_store inline assembly constraints
  [S390] Fix build failure in __cpu_up()
  [S390] vt220 console, initialize list head before use
  [S390] cio: Fix inverted isc priorities.
  [S390] vmemmap: fix off-by-one bug.
  [S390] cio: Fix sparse warnings in blacklist.c.
  [S390] sparsemem: use SPARSEMEM_STATIC if !64BIT.