tree 7c842bbfdc322b5ff99644e8b1bc7b415669233e
parent 27665ffa22b9b83bab226bf12c61424f7f1f8995
parent dcd998ccdbf74a7d8fe0f0a44e85da1ed5975946
author Linus Torvalds <torvalds@linux-foundation.org> 1312420329 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312420329 -1000

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  tcm_fc: Handle DDP/SW fc_frame_payload_get failures in ft_recv_write_data
  target: Fix bug for transport_generic_wait_for_tasks with direct operation
  target: iscsi_target depends on NET
  target: Fix WRITE_SAME_16 lba assignment breakage
  MAINTAINERS: Add target-devel list for drivers/target/
  iscsi-target: Fix CONFIG_SMP=n and CONFIG_MODULES=n build failure
  iscsi-target: Fix snprintf usage with MAX_PORTAL_LEN
  iscsi-target: Fix uninitialized usage of cmd->pad_bytes
  iscsi-target: strlen() doesn't count the terminator
  iscsi-target: Fix NULL dereference on allocation failure