tree 7f9cce370f5e01b0c3a5e17a230e3e9207054e7c
parent 75ecb1a4d148b274aa9acd1d6ccaca0a4654784e
parent cbea66d9788a344e16e161f22a6e0c4deef2c0ed
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1186874338 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1186874338 -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] monwriter: Serialization bug for multithreaded applications.
  [S390] vmur: diag14 only works with buffers below 2GB
  [S390] vmur: add "top of queue" sanity check for reader open
  [S390] vmur: reject open on z/VM reader files with status HOLD
  [S390] vmur: use DECLARE_COMPLETION_ONSTACK to keep lockdep happy
  [S390] vmur: allocate single record buffers instead of one big data buffer
  [S390] remove DEFAULT_MIGRATION_COST
  [S390] qdio: make sure data structures are correctly aligned.
  [S390] hypfs: implement show_options
  [S390] cio: avoid memory leak on error in css_alloc_subchannel().