The patch titled serial-add-supraexpress-336i-pnp-voice-modem-fix has been added to the -mm tree. Its filename is serial-add-supraexpress-336i-pnp-voice-modem-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial-add-supraexpress-336i-pnp-voice-modem-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> argh. Fix my fix for Daniel's MUA-munched whitespace. Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Cc: Daniel Gagnon <daniel.gagnon@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/8250_pnp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/serial/8250_pnp.c~serial-add-supraexpress-336i-pnp-voice-modem-fix drivers/serial/8250_pnp.c --- a/drivers/serial/8250_pnp.c~serial-add-supraexpress-336i-pnp-voice-modem-fix +++ a/drivers/serial/8250_pnp.c @@ -270,8 +270,8 @@ static const struct pnp_device_id pnp_de { "RSS0250", 0 }, /* SupraExpress 28.8 Data/Fax PnP modem */ { "SUP1310", 0 }, - /* SupraExpress 336i PnP Voice Modem */ - { "SUP1381", 0 }, + /* SupraExpress 336i PnP Voice Modem */ + { "SUP1381", 0 }, /* SupraExpress 33.6 Data/Fax PnP modem */ { "SUP1421", 0 }, /* SupraExpress 33.6 Data/Fax PnP modem */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch alpha-fix-vmalloc-breakage.patch revert-mm-vmalloc-use-mutex-for-purge.patch kprobes-fix-module-compilation-error-with-config_kprobes=n-fix.patch lib-idrc-use-kmem_cache_zalloc-for-the-idr_layer-cache.patch hp_accel-do-not-call-acpi-from-invalid-context.patch i-need-old-gcc.patch mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch next-remove-localversion.patch arch-ia64-kernel-ia64_ksymsc-dont-export-copy_page-twice.patch thinkpad-acpi-split-delayed-leds-stuff-clean-up-code-checkpatch-fixes.patch drivers-consolidate-driver_probe_done-loops-into-one-place-fix.patch drivers-consolidate-driver_probe_done-loops-into-one-place-checkpatch-fixes.patch clocksource-pass-clocksource-to-read-callback.patch drivers-ata-pata_alic-s-isa_bridge-ali_isa_bridge-to-fix-alpha-build.patch drivers-net-mlx4-profilec-fix-min-warning.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets.patch kernel-trace-ring_bufferc-reduce-inlining.patch kernel-trace-ring_bufferc-use-div_round_up.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch ext2-update-also-inode-on-disk-when-dir-is-is_dirsync.patch scsi-dpt_i2o-is-bust-on-ia64.patch nommu-fix-a-number-of-issues-with-the-per-mm-vma-patch.patch serial-add-supraexpress-336i-pnp-voice-modem-fix.patch page_fault-retry-with-nopage_retry.patch page_fault-retry-with-nopage_retry-fix-3-fix.patch mm-add-proc-controls-for-pdflush-threads-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-fix.patch proc-pid-maps-dont-show-pgoff-of-pure-anon-vmas-checkpatch-fixes.patch ecryptfs-some-inode-attr-fixes-fix.patch rtc-convert-leap_year-into-an-inline.patch rtc-add-platform-driver-for-efi-fix.patch nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html