Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 22:29:33 +0000 (15:29 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 17 Jul 2007 22:29:33 +0000 (15:29 -0700)
commitfd2f261053b2f125d5f6882b6d095ce2f4076fe5
tree5be548353e3c8b3a7e1e5e01e41b88777ad6d249
parent99e1221d1a1edac316f7f8116c781f75733b1159
parenta07a5b336f699e21d405764931a9d5426dc4f945
Merge branch 'for-linus' of git://git390.osdl.marist.edu/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] Fix broken logic, SIGA flags must be bitwise ORed
  [S390] cio: Dont print trailing \0 in modalias_show().
  [S390] Simplify stack trace.
  [S390] z/VM unit record device driver
  [S390] vmcp cleanup
  [S390] qdio: output queue stall on FCP and network devices
  [S390] Fix disassembly of RX_URRD, SI_URD & PC-relative instructions.
  [S390] Update default configuration.