summaryrefslogtreecommitdiff
path: root/drivers/s390/char/sclp_tty.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 13:54:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 13:54:55 -0700
commit494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b (patch)
treebda9ccabb49502ea64427c2958a69b7aa9069c6b /drivers/s390/char/sclp_tty.h
parentf18194275c39835cb84563500995e0d503a32d9a (diff)
parent55ee67f837882f28a900705a2ca1af257ab6c53d (diff)
downloadlinux-3.10-494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b.tar.gz
linux-3.10-494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b.tar.bz2
linux-3.10-494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata-sff: remove harmful BUG_ON from ata_bmdma_qc_issue sata_mv: fix broken DSM/TRIM support (v2) libata: be less of a drama queen on empty data commands [libata] sata_dwc_460ex: signdness bug ahci: add HFLAG_YES_FBS and apply it to 88SE9128 libata: remove no longer needed pata_winbond driver pata_cmd64x: revert commit d62f5576
Diffstat (limited to 'drivers/s390/char/sclp_tty.h')
0 files changed, 0 insertions, 0 deletions