The patch titled ieee1394: trivial edits of a few comments has been added to the -mm tree. Its filename is ieee1394-trivial-edits-of-a-few-comments.patch From: Jody McIntyre ieee1394: trivial edits of a few comments Signed-off-by: Stefan Richter Signed-off-by: Ben Collins Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton --- drivers/ieee1394/hosts.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/ieee1394/hosts.h~ieee1394-trivial-edits-of-a-few-comments drivers/ieee1394/hosts.h --- 25/drivers/ieee1394/hosts.h~ieee1394-trivial-edits-of-a-few-comments Thu Sep 22 15:07:23 2005 +++ 25-akpm/drivers/ieee1394/hosts.h Thu Sep 22 15:07:23 2005 @@ -135,17 +135,17 @@ enum isoctl_cmd { enum reset_types { /* 166 microsecond reset -- only type of reset available on - non-1394a capable IEEE 1394 controllers */ + non-1394a capable controllers */ LONG_RESET, /* Short (arbitrated) reset -- only available on 1394a capable - IEEE 1394 capable controllers */ + controllers */ SHORT_RESET, - /* Variants, that set force_root before issueing the bus reset */ + /* Variants that set force_root before issueing the bus reset */ LONG_RESET_FORCE_ROOT, SHORT_RESET_FORCE_ROOT, - /* Variants, that clear force_root before issueing the bus reset */ + /* Variants that clear force_root before issueing the bus reset */ LONG_RESET_NO_FORCE_ROOT, SHORT_RESET_NO_FORCE_ROOT }; _ Patches currently in -mm which might be from scjody@steamballoon.com are maintainers-sbp2-driver-is-not-orphaned.patch sbp2-fix-deadlocks-and-delays-on-device-removal-rmmod.patch sbp2-default-to-serialize_io=1.patch ieee1394-reorder-activities-after-bus-reset-fixes-device-detection.patch ieee1394-skip-unnecessary-pause-when-scanning-config-roms.patch ieee1394-fix-for-debug-output.patch ieee1394-use-time_before.patch ieee1394-trivial-edits-of-a-few-comments.patch ieee1394-remove-superfluous-include-in-csr1212.patch eth1394-workaround-limitation-in-rawiso-routines.patch ieee1394-delete-legacy-module-aliases.patch ohci1394-less-noise-in-dmesg.patch