You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 188da98800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (58 commits) ide: remove ide_init_default_irq() macro ide: move default IDE ports setup to ide_generic host driver ide: remove obsoleted "idex=noprobe" kernel parameter (take 2) ide: remove needless hwif->irq check from ide_hwif_configure() ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers ide: limit legacy VLB host drivers to alpha, x86 and mips cmd640: init hwif->{io_ports,irq} explicitly cmd640: cleanup setup_device_ptrs() ide: add ide-4drives host driver (take 3) ide: remove ppc ifdef from init_ide_data() ide: remove ide_default_io_ctl() macro ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT ide: add CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS (take 2) ppc/pmac: remove no longer needed IDE quirk ppc: don't include <linux/ide.h> ppc: remove ppc_ide_md ppc/pplus: remove ppc_ide_md.ide_init_hwif hook ppc/sandpoint: remove ppc_ide_md hooks ppc/lopec: remove ppc_ide_md hooks ppc/mpc8xx: remove ppc_ide_md hooks ...		17 years ago
..
4xx_io	[POWERPC] Spelling fixes: arch/ppc/	18 years ago
8xx_io	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	17 years ago
8260_io	Remove pointless casts from void pointers	17 years ago
boot	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	17 years ago
configs	ppc/sandpoint: remove ppc_ide_md hooks	17 years ago
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6	17 years ago
lib	[POWERPC] User rheap from arch/powerpc/lib	18 years ago
mm	CONFIG_HIGHPTE vs. sub-page page tables.	17 years ago
platforms	ppc: don't include <linux/ide.h>	17 years ago
syslib	ppc/mpc8xx: remove ppc_ide_md hooks	17 years ago
xmon	[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c	17 years ago
.gitignore	[POWERPC] Only ignore arch/ppc/include, not arch/ppc/boot/include	18 years ago
Kconfig	ide: introduce HAVE_IDE	17 years ago
Kconfig.debug	…
Makefile	[PPC] Remove 85xx from arch/ppc	17 years ago