aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ide-ioctls.c
diff options
context:
space:
mode:
authorLinus Torvalds2012-07-06 13:59:50 -0700
committerLinus Torvalds2012-07-06 13:59:50 -0700
commitc8912f2be34dc95508b3f870b129cd82524a9761 (patch)
tree61ab903b0f42bca574ab71d0cc4c56c21b512274 /drivers/ide/ide-ioctls.c
parentaf9b9a53fa0a86921edb86973f9661ccc7ddb90d (diff)
parent4f1d0f1971ba37010603a3a5c763f398b888d2f4 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull target fixes from Nicholas Bellinger: "Two minor target fixes. There is really nothing exciting and/or controversial this time around. There's one fix from MDR for a RCU debug warning message within tcm_fc code (CC'ed to stable), and a small AC fix for qla_target.c based upon a recent Coverity static report. Also, there is one other outstanding virtio-scsi LUN scanning bugfix that has been uncovered with the in-flight tcm_vhost driver over the last days, and that needs to make it into 3.5 final too. This patch has been posted to linux-scsi again here: http://marc.info/?l=linux-scsi&m=134160609212542&w=2 and I've asked James to include it in his next PULL request." * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: qla2xxx: print the right array elements in qlt_async_event tcm_fc: Resolve suspicious RCU usage warnings
Diffstat (limited to 'drivers/ide/ide-ioctls.c')
0 files changed, 0 insertions, 0 deletions