aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* merge linus into release branchLen Brown2006-06-29
|\ | | | | | | | | | | Conflicts: drivers/acpi/acpi_memhotplug.c
| * [PATCH] usb gadget: fixup pxa2xx_udc to include asm/arch/udc.h againMilan Svoboda2006-06-29
| | | | | | | | | | | | | | | | | | | | This fixes pxa2xx_udc.c to include asm/arch/udc.h again to fix current build breakage. Signed-off-by: Milan Svoboda <msvoboda@ra.rockwell.com> [ forwarded by David Brownell <david-b@pacbell.net> ] [ fixed to apply properly by Linus ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6Linus Torvalds2006-06-29
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6: (22 commits) [PATCH] devfs: Remove it from the feature_removal.txt file [PATCH] devfs: Last little devfs cleanups throughout the kernel tree. [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEV [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer needed [PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree [PATCH] devfs: Remove devfs_remove() function from the kernel tree [PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree [PATCH] devfs: Remove devfs_mk_bdev() function from the kernel tree [PATCH] devfs: Remove devfs_mk_symlink() function from the kernel tree [PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree [PATCH] devfs: Remove devfs_*_tape() functions from the kernel tree [PATCH] devfs: Remove devfs support from the sound subsystem [PATCH] devfs: Remove devfs support from the ide subsystem. [PATCH] devfs: Remove devfs support from the serial subsystem [PATCH] devfs: Remove devfs from the init code [PATCH] devfs: Remove devfs from the partition code ...
| | * [PATCH] devfs: Remove it from the feature_removal.txt fileGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | | | | | | | This file was created due to the issue regarding how to notify people that devfs was going to be removed. Finally remove the entry as it has served its purpose. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Last little devfs cleanups throughout the kernel tree.Greg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | | | | Just removes a few unused #defines and fixes some comments due to devfs now being gone. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Rename TTY_DRIVER_NO_DEVFS to TTY_DRIVER_DYNAMIC_DEVGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've always found this flag confusing. Now that devfs is no longer around, it has been renamed, and the documentation for when this flag should be used has been updated. Also fixes all drivers that use this flag. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove the tty_driver devfs_name field as it's no longer neededGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove the line_driver devfs_name field as it's no longer neededGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove the videodevice devfs_name field as it's no longer neededGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer neededGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | | | | And remove the now unneeded number field. Also fixes all drivers that set these fields. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer neededGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also fixes all drivers that set this field. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove the devfs_fs_kernel.h file from the treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also fixes up all files that #include it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs_remove() function from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Removes the devfs_remove() function and all callers of it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs_mk_cdev() function from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Removes the devfs_mk_cdev() function and all callers of it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs_mk_bdev() function from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Removes the devfs_mk_bdev() function and all callers of it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs_mk_symlink() function from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Removes the devfs_mk_symlink() function and all callers of it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs_mk_dir() function from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Removes the devfs_mk_dir() function and all callers of it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs_*_tape() functions from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | | | | Removes the devfs_register_tape() and devfs_unregister_tape() functions and all callers of them. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs support from the sound subsystemGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs support from the ide subsystem.Greg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also removes the ide drive devfs_name field as it's no longer needed Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs support from the serial subsystemGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Also fixes all serial drivers. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs from the init codeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | This patch removes the devfs code from the init/ directory. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs from the partition codeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | This patch removes the devfs code from the fs/partitions/ directory. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs documentation from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | Removes the Documentaiton/filesystems/devfs/ directory Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * [PATCH] devfs: Remove devfs from the kernel treeGreg Kroah-Hartman2006-06-26
| | | | | | | | | | | | | | | | | | | | | | | | This is the first patch in a series of patches that removes devfs support from the kernel. This patch removes the core devfs code, and its private header file. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgartLinus Torvalds2006-06-29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Make AGP depend on PCI [AGPGART] remove unused variable [AGPGART] Fix pci_register_driver checking in amd64-agp [AGPGART] Compile fix for ati-agp [AGPGART] Suspend/Resume support for nVidia nForce AGP. [AGPGART] Suspend/Resume improvements for ATI AGP [AGPGART] Whitespace cleanups for ati-agp
| | * \ Merge ../linusDave Jones2006-06-29
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/char/agp/Kconfig
| | * | | [AGPGART] Make AGP depend on PCIDave Jones2006-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes possible compile error in amd64 with pci=n pointed out by Adrian Bunk. Signed-off-by: Dave Jones <davej@redhat.com>
| | * | | [AGPGART] remove unused variableAdrian Bunk2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes an unused variable. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Dave Jones <davej@redhat.com>
| | * | | [AGPGART] Fix pci_register_driver checking in amd64-agpDave Jones2006-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pci_register_driver() never returns a positive number. Signed-off-by: Dave Jones <davej@redhat.com>
| | * | | [AGPGART] Compile fix for ati-agpDave Jones2006-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
| | * | | [AGPGART] Suspend/Resume support for nVidia nForce AGP.Dave Jones2006-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on a patch from the Ubuntu kernel. Signed-off-by: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Dave Jones <davej@redhat.com>
| | * | | [AGPGART] Suspend/Resume improvements for ATI AGPDave Jones2006-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on patches in the Ubuntu kernel. Signed-off-by: Ben Collins <bcollins@ubuntu.com> Signed-off-by: Dave Jones <davej@redhat.com>
| | * | | [AGPGART] Whitespace cleanups for ati-agpDave Jones2006-06-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dave Jones <davej@redhat.com>
| * | | | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-06-29
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (33 commits) [MIPS] Add missing backslashes to macro definitions. [MIPS] Death list of board support to be removed after 2.6.18. [MIPS] Remove BSD and Sys V compat data types. [MIPS] ioc3.h: Uses u8, so include <linux/types.h>. [MIPS] 74K: Assume it will also have an AR bit in config7 [MIPS] Treat CPUs with AR bit as physically indexed. [MIPS] Oprofile: Support VSMP on 34K. [MIPS] MIPS32/MIPS64 S-cache fix and cleanup [MIPS] excite: PCI makefile needs to use += if it wants a chance to work. [MIPS] excite: plat_setup -> plat_mem_setup. [MIPS] au1xxx: export dbdma functions [MIPS] au1xxx: dbdma, no sleeping under spin_lock [MIPS] au1xxx: fix PSC_SMBTXRX_RSR. [MIPS] Early printk for IP27. [MIPS] Fix handling of 0 length I & D caches. [MIPS] Typo fixes. [MIPS] MIPS32/MIPS64 secondary cache management [MIPS] Fix FIXADDR_TOP for TX39/TX49. [MIPS] Remove first timer interrupt setup in wrppmc_timer_setup() [MIPS] Fix configuration of R2 CPU features and multithreading. ...
| | * | | [MIPS] Add missing backslashes to macro definitions.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] Death list of board support to be removed after 2.6.18.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As usual fixes would be prefered. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] Remove BSD and Sys V compat data types.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] ioc3.h: Uses u8, so include <linux/types.h>.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] 74K: Assume it will also have an AR bit in config7Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] Treat CPUs with AR bit as physically indexed.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] Oprofile: Support VSMP on 34K.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] MIPS32/MIPS64 S-cache fix and cleanupAtsushi Nemoto2006-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blast_scache_range, blast_inv_scache_range for mips32/mips64 scache routine. Also initialize waybit for MIPS32/MIPS64 S-cache. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] excite: PCI makefile needs to use += if it wants a chance to work.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] excite: plat_setup -> plat_mem_setup.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] au1xxx: export dbdma functionsDomen Puncer2006-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are needed for au1550_ac97 module. Signed-off-by: Domen Puncer <domen.puncer@ultra.si> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] au1xxx: dbdma, no sleeping under spin_lockDomen Puncer2006-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kmalloc under spin_lock can't sleep. Signed-off-by: Domen Puncer <domen.puncer@ultra.si> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] au1xxx: fix PSC_SMBTXRX_RSR.Domen Puncer2006-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Domen Puncer <domen.puncer@ultra.si> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] Early printk for IP27.Ralf Baechle2006-06-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| | * | | [MIPS] Fix handling of 0 length I & D caches.Chris Dearman2006-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't ask. Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-13 08:20:34 -0500