Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2009 22:31:15 +0000 (15:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2009 22:31:15 +0000 (15:31 -0700)
commite7d688ec86c9c6aa94b58eeb266f833a76407018
treedb7ce6fe6fc9b8c69287d2e8ee11f8724d171682
parentd470c05bedc27dbd2df9d0bb6fd82336e4ff43db
parentac522b638dcb549f9d33085c6fadea88a5f826ae
Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] sclp_vt220 build fix
  [S390] cio: change misleading console logic
  [S390] call home support: fix proc handler
  [S390] dasd: use idal for device characteristics
  [S390] Add highgprs facility to /proc/cpuinfo
  [S390] dasd: fix locking bug
  [S390] tape390: Fix request queue handling in block driver
  [S390] hypfs: Use subcode 6 if subcode 7 is not available