Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 24 Sep 2006 03:41:53 +0000 (20:41 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 24 Sep 2006 03:41:53 +0000 (20:41 -0700)
commit4f5537de7c1531398e84e18a24f667e49cc94208
treefe598e6cda4715e0af97e62d6084c00a1bb42475
parentf164c42161d21368d9cd4d6d6efc158baa2618db
parent1b73c4bb063c4aa0cdc25425809bb87f65ee75af
Merge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
  [SCSI] scsi_transport_fc: fixup netlink arguments