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 ...		2008-04-18 08:39:24 -07:00
..
mach-bigsmp
mach-default	x86: don't set IO APIC features if IO APIC is not enabled	2008-04-17 17:41:34 +02:00
mach-es7000	x86: change GET_APIC_ID() from an inline function to an out-of-line function	2008-04-17 17:41:33 +02:00
mach-generic
mach-numaq
mach-rdc321x
mach-summit
mach-visws	x86: change GET_APIC_ID() from an inline function to an out-of-line function	2008-04-17 17:41:33 +02:00
mach-voyager
uv	x86: define the macros and tables for blade functions	2008-04-17 17:41:33 +02:00
xen
a.out-core.h
a.out.h
acpi.h
agp.h
alternative-asm.h
alternative.h
apic.h
apicdef.h	x86: increase size of APICID	2008-04-17 17:41:33 +02:00
arch_hooks.h
asm.h
atomic_32.h
atomic_64.h
atomic.h
auxvec.h
bios_ebda.h
bitops_32.h
bitops_64.h
bitops.h
boot.h
bootparam.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h	x86: add comments to describe the new api's in cacheflush.h	2008-04-17 17:41:31 +02:00
calgary.h
calling.h
checksum_32.h
checksum_64.h
checksum.h
cmpxchg_32.h
cmpxchg_64.h
cmpxchg.h
compat.h
cpu.h
cpufeature.h
cputime.h
current_32.h
current_64.h
current.h
debugreg.h
delay.h
desc_defs.h
desc.h
device.h
div64.h
dma-mapping_32.h
dma-mapping_64.h
dma-mapping.h
dma.h
dmi.h
ds.h
dwarf2_32.h
dwarf2_64.h
dwarf2.h
e820_32.h
e820_64.h
e820.h
edac.h
efi.h
elf.h
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap_32.h
fixmap_64.h
fixmap.h
floppy.h	x86 floppy: kill off the 'register' keyword from header	2008-04-17 17:41:30 +02:00
frame.h
futex.h
gart.h
genapic_32.h	x86: add functions to determine if platform is a UV platform	2008-04-17 17:41:33 +02:00
genapic_64.h	x86: support for new UV apic	2008-04-17 17:41:33 +02:00
genapic.h
geode.h
gpio.h
hardirq_32.h
hardirq_64.h
hardirq.h
highmem.h
hpet.h
hw_irq_32.h
hw_irq_64.h
hw_irq.h
hypertransport.h
i387.h
i8253.h
i8259.h
ia32_unistd.h
ia32.h
ide.h	ide: remove ide_init_default_irq() macro	2008-04-18 00:46:35 +02:00
idle.h
intel_arch_perfmon.h
io_32.h
io_64.h
io_apic.h	x86: move mp_ioapic_routing to boot.c	2008-04-17 17:41:35 +02:00
io.h
ioctl.h
ioctls.h
iommu.h
ipcbuf.h
ipi.h
irq_32.h
irq_64.h
irq_regs_32.h
irq_regs_64.h
irq_regs.h
irq.h
irqflags.h
ist.h
k8.h
Kbuild	x86: cleanup replace most vm86 flags with flags from processor-flags.h, fix	2008-04-17 17:41:33 +02:00
kdebug.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-kgdb	2008-04-18 08:37:01 -07:00
kexec.h
kgdb.h	x86: kgdb support	2008-04-17 20:05:37 +02:00
kmap_types.h
kprobes.h
kvm_host.h
kvm_para.h
kvm_x86_emulate.h
kvm.h
ldt.h
lguest_hcall.h
lguest.h
linkage.h
local.h
math_emu.h
mc146818rtc.h
mca_dma.h
mca.h
mce.h
mman.h
mmu_context_32.h
mmu_context_64.h
mmu_context.h
mmu.h
mmx.h
mmzone_32.h
mmzone_64.h
mmzone.h
module.h
mpspec_def.h
mpspec.h	x86: move mp_register_lapic_address to boot.c	2008-04-17 17:41:35 +02:00
msgbuf.h
msidef.h
msr-index.h	x86: split large page mapping for AMD TSEG	2008-04-17 17:41:30 +02:00
msr.h	x86: re-add rdmsrl_safe	2008-04-17 17:41:30 +02:00
mtrr.h
mutex_32.h
mutex_64.h
mutex.h
namei.h
nmi.h
nops.h
numa_32.h
numa_64.h
numa.h
numaq.h
page_32.h
page_64.h	x86: account overlapped mappings in max_pfn_mapped	2008-04-17 17:41:30 +02:00
page.h	x86: replace the now useless max_pfn_mapped define	2008-04-17 17:41:30 +02:00
param.h
paravirt.h	x86: re-add rdmsrl_safe	2008-04-17 17:41:30 +02:00
parport.h
pat.h
pci_32.h
pci_64.h
pci-direct.h
pci.h
pda.h
percpu.h	include/asm-x86/percpu.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
pgalloc_32.h
pgalloc_64.h
pgalloc.h
pgtable_32.h	include/asm-x86/pgtable_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
pgtable_64.h	include/asm-x86/pgtable_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
pgtable-2level-defs.h
pgtable-2level.h	include/asm-x86/pgtable-2level.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
pgtable-3level-defs.h
pgtable-3level.h	include/asm-x86/pgtable-3level.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
pgtable.h	x86: pgtable, document pde bits	2008-04-17 17:41:29 +02:00
poll.h
posix_types_32.h	include/asm-x86/posix_types_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
posix_types_64.h	include/asm-x86/posix_types_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
posix_types.h
prctl.h
processor-cyrix.h
processor-flags.h
processor.h	include/asm-x86/processor.h: checkpatch cleanups - formatting only	2008-04-17 17:41:26 +02:00
proto.h	x86: account overlapped mappings in max_pfn_mapped	2008-04-17 17:41:30 +02:00
ptrace-abi.h
ptrace.h	x86: cleanup - rename VM_MASK to X86_VM_MASK	2008-04-17 17:41:33 +02:00
reboot_fixups.h
reboot.h	include/asm-x86/reboot.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
required-features.h
resource.h
resume-trace.h	include/asm-x86/resume-trace.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
rio.h	include/asm-x86/rio.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
rtc.h
rwlock.h
rwsem.h	include/asm-x86/rwsem.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
scatterlist.h
seccomp_32.h
seccomp_64.h
seccomp.h
sections.h
segment.h	x86: don't set up early exception handlers for external interrupts	2008-04-17 17:41:29 +02:00
semaphore.h
sembuf.h
serial.h
setup.h	include/asm-x86/setup.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
shmbuf.h
shmparam.h
sigcontext32.h	include/asm-x86/sigcontext32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
sigcontext.h	include/asm-x86/sigcontext.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
siginfo.h
signal.h	include/asm-x86/signal.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
smp.h	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00
socket.h
sockios.h
sparsemem.h	x86: sparsemem: reduce i386 PAE section size	2008-04-17 17:41:33 +02:00
spinlock_types.h
spinlock.h	x86: spinlock ops are always-inlined	2008-04-17 17:41:29 +02:00
srat.h	include/asm-x86/srat.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
stacktrace.h
stat.h
statfs.h
string_32.h	include/asm-x86/string_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
string_64.h	include/asm-x86/string_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
string.h
suspend_32.h	include/asm-x86/suspend_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
suspend_64.h	include/asm-x86/suspend_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
suspend.h
swiotlb.h	include/asm-x86/swiotlb.h: checkpatch cleanups - formatting only	2008-04-17 17:41:27 +02:00
sync_bitops.h	x86: simplify sync_test_bit(), improve	2008-04-17 17:41:30 +02:00
system_64.h
system.h	include/asm-x86/system.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
tce.h	include/asm-x86/tce.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
termbits.h
termios.h
therm_throt.h
thread_info_32.h	include/asm-x86/thread_info_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
thread_info_64.h	include/asm-x86/thread_info_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
thread_info.h
time.h
timer.h
timex.h
tlb.h
tlbflush.h	include/asm-x86/tlbflush.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
topology.h	x86: clean up non-smp usage of cpu maps	2008-04-17 17:41:34 +02:00
trampoline.h	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00
tsc.h	include/asm-x86/tsc.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
types.h
uaccess_32.h	include/asm-x86/uaccess_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
uaccess_64.h	include/asm-x86/uaccess_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
uaccess.h
ucontext.h
unaligned.h	include/asm-x86/unaligned.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
unistd_32.h	include/asm-x86/unistd_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
unistd_64.h	include/asm-x86/unistd_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
unistd.h
unwind.h
user32.h	include/asm-x86/user32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
user_32.h	include/asm-x86/user_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
user_64.h	include/asm-x86/user_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
user.h
vdso.h	include/asm-x86/vdso.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
vga.h	include/asm-x86/vga.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
vgtod.h
vic.h
vm86.h	x86: replace most VM86 flags with flags from processor-flags.h	2008-04-17 17:41:33 +02:00
vmi_time.h
vmi.h	include/asm-x86/vmi.h: checkpatch cleanups - formatting only	2008-04-17 17:41:28 +02:00
voyager.h	include/asm-x86/voyager.h: checkpatch cleanups - formatting only	2008-04-17 17:41:29 +02:00
vsyscall.h
xor_32.h	include/asm-x86/xor_32.h: checkpatch cleanups - formatting only	2008-04-17 17:41:29 +02:00
xor_64.h	include/asm-x86/xor_64.h: checkpatch cleanups - formatting only	2008-04-17 17:41:29 +02:00
xor.h