From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded] drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix.patch removed from -mm tree Date: Fri, 23 Apr 2010 13:11:23 -0400 Message-ID: <201004232012.o3NKCw3d009548@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:52296 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756725Ab0DWUNk (ORCPT ); Fri, 23 Apr 2010 16:13:40 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, pjones@redhat.com, t.m.gerlach@freenet.de, mm-commits@vger.kernel.org The patch titled drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix has been removed from the -mm tree. Its filename was drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix.patch This patch was dropped because it was folded into drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix From: Andrew Morton rename optname, per Peter Jones Cc: Peter Jones Cc: Thomas Gerlach Signed-off-by: Andrew Morton --- drivers/video/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/video/efifb.c~drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix drivers/video/efifb.c --- a/drivers/video/efifb.c~drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix +++ a/drivers/video/efifb.c @@ -71,7 +71,7 @@ static struct efifb_dmi_info { [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */ [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 }, [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 }, - [M_MBP_5_1] = { "mbp5,1", 0xc0010000, 2048 * 4, 1440, 900 }, + [M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 }, [M_UNKNOWN] = { NULL, 0, 0, 0, 0 } }; _ Patches currently in -mm which might be from akpm@linux-foundation.org are drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51.patch drivers-video-efifbc-framebuffer-for-nvidia-9400m-in-macbook-pro-51-fix.patch hugetlb-fix-infinite-loop-in-get_futex_key-when-backed-by-huge-pages-fix.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch arch-x86-crypto-aesni-intel_asms-still-busted.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch intel-agpc-fix-crash-when-accessing-nonexistent-gtt-entries-in-i915-checkpatch-fixes.patch iio-iio_get_new_idr_val-return-negative-value-on-failure-fix.patch drivers-acpi-use-kasprintf-fix.patch acpi_pad-processor_aggregator-name-too-long-fix.patch compal-laptop-added-jhl90-battery-hwmon-interface-checkpatch-fixes.patch arch-arm-include-asm-elfh-forward-declare-the-task-struct.patch cifs-provide-user-with-a-hint-when-name-resolution-fails-fix.patch jfs-free-sbi-memory-in-error-path.patch fs-fscache-object-listc-fix-warning-on-32-bit.patch of-gpio-implement-gpiolib-notifier-hooks-fix.patch of-gpio-implement-gpiolib-notifier-hooks-fix-fix2.patch hpet-factor-timer-allocate-from-open-fix.patch led-driver-for-the-soekris-net5501-board-checkpatch-fixes.patch leds-route-kbd-leds-through-the-generic-leds-layer-fix.patch gpio-add-support-for-janz-vmod-ttl-digital-io-module-fix.patch 3x59x-fix-pci-resource-management.patch backlight-add-s6e63m0-amoled-lcd-panel-driver-checkpatch-fixes.patch serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed-fix.patch kernel-irq-managec-add-raise_threaded_irq-fix.patch max3100-to_max3100_port-small-style-fixes-fix.patch drivers-scsi-scsi_sysfsc-fix-sdev_rw_attr-macro-for-scsi-device-sysfs-entries-checkpatch-fixes.patch mm-allow-config_migration-to-be-set-without-config_numa-or-memory-hot-remove.patch mm-export-unusable-free-space-index-via-debugfs.patch mmcompaction-direct-compact-when-a-high-order-allocation-fails.patch buffer_head-remove-redundant-test-from-wait_on_buffer-fix.patch wait_on_buffer-remove-the-buffer_locked-test.patch mm-introduce-free_pages_prepare-fix.patch frv-extend-gdbstub-to-support-more-features-of-gdb-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch kernel-wide-replace-ushort_max-short_max-and-short_min-with-ushrt_max-shrt_max-and-shrt_min-fix.patch firmware-loader-use-statically-initialized-data-attribute-fix.patch firmware-loader-use-statically-initialized-data-attribute-fix-fix.patch davinci-mmc-updates-to-suspend-resume-implementation-checkpatch-fixes.patch checkpatch-add-check-for-too-short-kconfig-descriptions-checkpatch-fixes.patch crc32-major-optimization-checkpatch-fixes.patch hwmon-driver-for-ti-tmp102-temperature-sensor.patch hwmon-driver-for-ti-tmp102-temperature-sensor-fix.patch hwmon-add-ti-ads7871-a-d-converter-driver-checkpatch-fixes.patch rtc-mxc-remove-unnecessary-clock-source-for-rtc-subsystem.patch gpiolib-make-names-array-and-its-values-const-fix.patch memcg-oom-kill-disable-and-oom-status-update-checkpatch-fixes.patch memcg-move-charge-of-file-pages-fix.patch proc-turn-signal_struct-count-into-int-nr_threads-checkpatch-fixes.patch fault-injection-add-cpu-notifier-error-injection-module-fix.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch drivers-edac-convert-logging-messages-direct-uses-of-__file__-to-%s-__file-checkpatch-fixes.patch panic-allow-taint-flag-for-warnings-to-be-changed-from-taint_warn-checkpatch-fixes.patch x86_32-use-asm-generic-scatterlisth.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch notify_change-callers-must-hold-i_mutex.patch