summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-22 20:54:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-22 20:54:06 +0200
commit67e5b2fad4e9848a954fd97de0509ec5cb6e6d47 (patch)
tree2aeb8a41d628fbbabebf407079b62cf0283b58ce /drivers/tty
parentMerge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentiscsi-target: Remove left over v3.10-rc debug printks (diff)
downloadlinux-67e5b2fad4e9848a954fd97de0509ec5cb6e6d47.tar.xz
linux-67e5b2fad4e9848a954fd97de0509ec5cb6e6d47.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull SCSI target fixes from Nicholas Bellinger: "Included is the recent tcm_qla2xxx residual underrun length fix from Roland, along with Joern's iscsi-target patch for session_lock breakage within iscsit_stop_time2retain_timer() code. Both are CC'ed to stable. The remaining two are specific to recent iscsi-target + iser conversion changes. One drops some left-over debug noise, and Andy's patch fixes configfs attribute handling during an explicit network portal feature bit disable when iser-target is unsupported." * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: iscsi-target: Remove left over v3.10-rc debug printks target/iscsi: Fix op=disable + error handling cases in np_store_iser tcm_qla2xxx: Fix residual for underrun commands that fail target/iscsi: don't corrupt bh_count in iscsit_stop_time2retain_timer()
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions