tree 451fcbc89084b1d9b83c105294794f29bf6d59f3
parent 8b14cb9953c6b569327e9372718cff09a98f9589
parent c51b9621796c31810fb66509ea1faee4597d9c03
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187806328 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187806328 -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] Change atomic_read/set to inline functions with barrier semantics.
  [S390] kprobes: fix instruction length calculation
  [S390] hypfs: inode corruption due to missing locking
  [S390] disassembler: fix b2 opcodes like srst, bsg, and others
  [S390] vmur: fix reference counting for vmur device structure
  [S390] vmur: fix diag14 exceptions with addresses > 2GB.
  [S390] qdio: Refresh buffer states for IQDIO Asynchronous output queue
  [S390] qdio: fix EQBS handling on CCQ96
  [S390] cio: change confusing message in cmf.
  [S390] cio: dont forget to set last slot to NULL in ccw_uevent().