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
..
a.out-core.h	aout: suppress A.OUT library support if !CONFIG_ARCH_SUPPORTS_AOUT	2008-02-08 09:22:30 -08:00
a.out.h	[SPARC]: Merge asm-sparc{,64}/a.out.h	2008-02-09 22:25:50 -08:00
apc.h
asi.h
asmmacro.h
atomic.h	Add cmpxchg_local to sparc, move __cmpxchg to system.h	2008-02-07 08:42:32 -08:00
auxio.h
auxvec.h
bitext.h
bitops.h	forbid asm/bitops.h direct inclusion	2007-10-19 11:53:41 -07:00
bpp.h	[SPARC]: Merge asm-sparc{,64}/bpp.h	2008-02-09 04:00:12 -08:00
btfixup.h
bug.h	[SPARC]: Merge asm-sparc{,64}/bug.h	2008-02-09 04:00:32 -08:00
bugs.h	[SPARC]: Merge asm-sparc{,64}/bugs.h	2008-02-09 04:00:37 -08:00
byteorder.h	[SPARC]: Merge asm-sparc{,64}/byteorder.h	2008-02-09 04:17:28 -08:00
cache.h	[SPARC]: Merge asm-sparc{,64}/cache.h	2008-02-09 04:17:37 -08:00
cacheflush.h
checksum.h
clock.h
contregs.h
cpudata.h
cputime.h
current.h	[SPARC]: Merge asm-sparc{,64}/current.h	2008-02-09 04:17:54 -08:00
cypress.h
delay.h
device.h	[SPARC]: Merge asm-sparc{,64}/device.h	2008-02-09 04:18:02 -08:00
div64.h
dma-mapping.h
dma.h	[SPARC32]: __inline__ --> inline	2007-10-27 00:17:01 -07:00
ebus.h
ecc.h
eeprom.h
elf.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2008-02-07 10:21:26 -08:00
emergency-restart.h
errno.h	[SPARC]: Merge asm-sparc{,64}/errno.h	2008-02-09 04:18:23 -08:00
fb.h	[SPARC]: Merge asm-sparc{,64}/fb.h	2008-02-09 04:18:29 -08:00
fbio.h
fcntl.h
fixmap.h
floppy.h	[SPARC32]: __inline__ --> inline	2007-10-27 00:17:01 -07:00
futex.h
hardirq.h
head.h
highmem.h
hw_irq.h
ide.h	ide: remove ide_default_io_ctl() macro	2008-04-18 00:46:34 +02:00
idprom.h
io-unit.h
io.h	Remove dma_cache_(wback|inv|wback_inv) functions	2007-10-17 08:42:57 -07:00
ioctl.h
ioctls.h	[SPARC]: Support for new termios.	2007-10-17 19:38:10 -07:00
iommu.h
ipcbuf.h
irq_regs.h
irq.h
irqflags.h
jsflash.h
Kbuild
kdebug.h
kgdb.h
kmap_types.h
kvm.h	kvm: provide kvm.h for all architecture: fixes headers_install	2008-04-02 15:28:18 -07:00
linkage.h
local.h
machines.h
mbus.h
mc146818rtc.h
memreg.h
mman.h
mmu_context.h
mmu.h
module.h
mostek.h
mpmbox.h
msgbuf.h
msi.h
mutex.h
mxcc.h
namei.h
obio.h
of_device.h
of_platform.h	[SPARC]: Remove of_platform_device_create	2008-02-09 03:49:58 -08:00
openprom.h
openpromio.h
oplib.h
page.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
param.h	avoid overflows in kernel/time.c	2008-02-08 09:22:39 -08:00
pbm.h
pci.h
pcic.h
pconf.h
percpu.h
perfctr.h
pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
pgtable.h
pgtsrmmu.h
pgtsun4.h
pgtsun4c.h
poll.h
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	2008-02-08 09:22:34 -08:00
processor.h	aout: move STACK_TOP[_MAX] to asm/processor.h	2008-02-08 09:22:29 -08:00
prom.h	[SPARC]: Merge include/asm-sparc{,64}/prom.h	2008-02-09 03:56:20 -08:00
psr.h
ptrace.h	[SPARC]: Move over to arch_ptrace().	2008-02-07 03:00:17 -08:00
reg.h
resource.h
ross.h
rtc.h
sbi.h
sbus.h
scatterlist.h	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
sections.h
semaphore.h	Generic semaphore implementation	2008-04-17 10:42:34 -04:00
sembuf.h
setup.h
sfp-machine.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h
smpprim.h
socket.h	[NET]: Introducing socket mark socket option.	2008-01-31 19:27:19 -08:00
sockios.h
solerrno.h
spinlock_types.h
spinlock.h
stat.h
statfs.h
string.h
sun4paddr.h
sun4prom.h
sunbpp.h
svr4.h
swift.h
sysen.h
system.h	[SPARC]: Add reboot_command[] extern decl to asm/system.h	2008-02-28 21:53:20 -08:00
termbits.h	[SPARC]: Support for new termios.	2007-10-17 19:38:10 -07:00
termios.h	[SPARC]: Support for new termios.	2007-10-17 19:38:10 -07:00
thread_info.h
timer.h
timex.h
tlb.h
tlbflush.h	remove unused flush_tlb_pgtables	2007-10-19 11:53:34 -07:00
topology.h
traps.h
tsunami.h
turbosparc.h
types.h
uaccess.h	aout: remove unnecessary inclusions of {asm, linux}/a.out.h	2008-02-08 09:22:30 -08:00
unaligned.h
unistd.h	[SPARC]: Add new timerfd syscall entries.	2008-02-06 04:12:23 -08:00
user.h
vac-ops.h
vaddrs.h
vfc_ioctls.h
vga.h
viking.h
winmacro.h
xor.h