The following commit has been merged in the linux branch: commit e7d688ec86c9c6aa94b58eeb266f833a76407018 Merge: d470c05bedc27dbd2df9d0bb6fd82336e4ff43db ac522b638dcb549f9d33085c6fadea88a5f826ae Author: Linus Torvalds torvalds@linux-foundation.org Date: Wed Oct 14 15:31:15 2009 -0700
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/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