summaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 03:27:50 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 03:27:50 +0200
commitfc15bc817eecd5c13581adab2a182c07edededa0 (patch)
tree4495364581afd49596e88882f58a2f1196bc512f /drivers/s390/scsi
parentMerge branch 'for-linus' of git://linux-nfs.org/~bfields/linux (diff)
parentUIO: Hilscher CIF card driver (diff)
downloadlinux-fc15bc817eecd5c13581adab2a182c07edededa0.tar.xz
linux-fc15bc817eecd5c13581adab2a182c07edededa0.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6: UIO: Hilscher CIF card driver UIO: Documentation UIO: Add the User IO core code
Diffstat (limited to 'drivers/s390/scsi')
0 files changed, 0 insertions, 0 deletions