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
..
arch-aaec2000	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
arch-at91	[ARM] 4863/1: AT91: CAP9 USART definitions for early debug	2008-03-20 15:59:30 +00:00
arch-cl7500
arch-clps711x
arch-davinci	[ARM] 4634/1: DaVinci GPIO header build fix	2007-10-31 15:21:52 +00:00
arch-ebsa110
arch-ebsa285
arch-ep93xx	[ARM] 4671/1: ep93xx: remove obsolete gpio_line_* operations	2008-01-26 14:37:31 +00:00
arch-h720x
arch-imx	imxfb: fast read flag and nonstandard field configurable	2007-10-16 09:43:21 -07:00
arch-integrator
arch-iop13xx	iop-adma: remove the workaround for missed interrupts on iop3xx	2008-04-17 13:25:54 -07:00
arch-iop32x	[ARM] 4476/1: EM7210/SS4000E support	2007-07-20 09:35:35 +01:00
arch-iop33x	iop3xx: surface the iop3xx DMA and AAU units to the iop-adma driver	2007-07-13 08:06:19 -07:00
arch-ixp4xx	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2008-02-04 15:29:53 -08:00
arch-ixp23xx	[ARM] 4680/1: parentheses around NR_IRQS definition	2007-11-29 20:56:57 +00:00
arch-ixp2000
arch-ks8695	[ARM] 4603/1: KS8695: debugfs interface to view pin state	2008-01-26 14:38:48 +00:00
arch-l7200
arch-lh7a40x
arch-msm	[ARM] msm: dma support for MSM7X00A	2008-01-26 14:39:14 +00:00
arch-mxc	[ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx	2007-07-28 20:52:55 +01:00
arch-netx
arch-ns9xxx	[ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32	2007-10-12 23:43:41 +01:00
arch-omap	[ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp	2008-03-20 15:59:31 +00:00
arch-orion	[ARM] Orion: free up kernel virtual address space	2008-02-08 11:52:23 -05:00
arch-pnx4008
arch-pxa	[ARM] 4843/1: Add GCR_CLKBPB for PXA3xx	2008-02-29 22:47:30 +00:00
arch-realview	[ARM] 4822/1: RealView: Change the REALVIEW_MPCORE configuration option	2008-02-04 17:52:28 +00:00
arch-rpc	[ARM] 4564/1: Add tagged list support for Acorn RiscPC's uncompress code	2007-10-12 23:43:11 +01:00
arch-s3c2400	[ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h	2007-07-22 17:06:04 +01:00
arch-s3c2410	spi: spi_s3c24xx must initialize num_chipselect	2008-04-15 19:35:41 -07:00
arch-sa1100	[ARM] unbalanced parenthesis fix	2007-10-12 23:43:21 +01:00
arch-shark
arch-versatile	fix typo 'the same the\>'	2008-02-03 14:59:11 +02:00
hardware	iop-adma: remove the workaround for missed interrupts on iop3xx	2008-04-17 13:25:54 -07:00
mach	[ARM] 4835/1: Fix stale comment in struct machine_desc description	2008-02-21 21:13:35 +00:00
plat-s3c	[ARM] include/asm-arm - use angle brackets for includes	2008-03-06 12:18:18 +00:00
plat-s3c24xx	[ARM] 4786/1: S3C2412: Add SPI FIFO controll constants	2008-01-28 13:20:51 +00:00
.gitignore
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	aout: move STACK_TOP[_MAX] to asm/processor.h	2008-02-08 09:22:29 -08:00
assembler.h
atomic.h
auxvec.h
bitops.h	ext4: Add ext4_find_next_bit()	2008-01-28 23:58:27 -05:00
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h	[ARM] Marvell Feroceon CPU core support	2008-01-26 15:03:38 +00:00
checksum.h
cnt32_to_63.h
cpu-multi32.h
cpu-single.h
cpu.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h	arm: sg fallout	2007-10-23 12:37:59 +02:00
dma.h
domain.h
dyntick.h
ecard.h
elf.h	Cleanup asm/{elf,page,user}.h: #ifdef __KERNEL__ is no longer needed	2008-02-07 08:42:30 -08:00
emergency-restart.h
errno.h
fb.h	fbdev: detect primary display device	2007-07-17 10:23:11 -07:00
fcntl.h
fiq.h
flat.h	[ARM] nommu: fix breakage caused by f9720205d1	2007-10-31 15:21:42 +00:00
floppy.h	cleanup floppy.h	2007-10-17 08:42:55 -07:00
fpstate.h	[ARM] 4583/1: ARMv7: Add VFPv3 support	2008-01-26 14:41:28 +00:00
futex.h
glue.h
gpio.h
hardirq.h
hardware.h
hw_irq.h
hwcap.h	[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file	2007-07-12 16:20:15 +01:00
ide.h	ide: remove ide_default_io_ctl() macro	2008-04-18 00:46:34 +02:00
io.h	endianness annotations in arm io.h	2007-10-14 12:41:52 -07:00
ioctl.h
ioctls.h
ipcbuf.h
irq.h
irq_regs.h
irqflags.h
Kbuild	[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file	2007-07-12 16:20:15 +01:00
kdebug.h
kexec.h	[ARM] 4838/1: Fix kexec for SA1100 machines	2008-02-29 22:47:09 +00:00
kmap_types.h
kprobes.h	Kprobes: indicate kretprobe support in Kconfig	2008-03-04 16:35:11 -08:00
kvm.h	kvm: provide kvm.h for all architecture: fixes headers_install	2008-04-02 15:28:18 -07:00
leds.h
limits.h
linkage.h
local.h
locks.h
mc146818rtc.h
memory.h
mman.h
mmu.h
mmu_context.h
mmzone.h
module.h
msgbuf.h
mtd-xip.h
mutex.h	misc: removal of final callers using fastcall	2008-02-08 09:22:31 -08:00
namei.h
nwflash.h
page-nommu.h
page.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
param.h
parport.h
pci.h	[ARM] 4577/1: ITE 8152 PCI bridge support	2007-10-15 18:53:59 +01:00
percpu.h
pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
pgtable-hwdef.h
pgtable-nommu.h	[ARM] 4850/1: include generic pgtable.h for !CONFIG_MMU case	2008-03-06 12:18:18 +00:00
pgtable.h	[ARM] 4644/2: fix flush_kern_tlb_range() in module space	2007-11-08 10:07:14 +00:00
poll.h
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	2008-02-08 09:22:34 -08:00
proc-fns.h	[ARM] include/asm-arm - use angle brackets for includes	2008-03-06 12:18:18 +00:00
processor.h	aout: move STACK_TOP[_MAX] to asm/processor.h	2008-02-08 09:22:29 -08:00
procinfo.h
ptrace.h	[ARM] 4474/1: Do not check the PSR_F_BIT in valid_user_regs	2007-07-12 16:20:52 +01:00
resource.h
rtc.h
scatterlist.h	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
sections.h
segment.h
semaphore.h	Generic semaphore implementation	2008-04-17 10:42:34 -04:00
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sizes.h
smp.h	[ARM] 4814/1: RealView: Add broadcasting clockevents support for ARM11MPCore	2008-02-04 17:52:19 +00:00
socket.h	[NET]: Introducing socket mark socket option.	2008-01-31 19:27:19 -08:00
sockios.h
spinlock.h
spinlock_types.h
stat.h
statfs.h
string.h
suspend.h
system.h	Add cmpxchg_local to arm	2008-02-07 08:42:31 -08:00
termbits.h
termios.h
therm.h
thread_info.h	remove unused TIF_NOTIFY_RESUME flag	2007-07-31 15:39:38 -07:00
thread_notify.h
timex.h
tlb.h	add mm argument to pte/pmd/pud/pgd_free	2008-02-05 09:44:18 -08:00
tlbflush.h	remove unused flush_tlb_pgtables	2007-10-19 11:53:34 -07:00
topology.h
traps.h	ARM kprobes: prevent some functions involved with kprobes from being probed	2008-01-26 15:25:17 +00:00
types.h	remove strict ansi check from __u64 in asm/types.h	2007-10-17 08:42:53 -07:00
uaccess.h
ucontext.h
unaligned.h	[ARM] 4837/1: make __get_unaligned_*() return unsigned types	2008-02-29 22:46:48 +00:00
unistd.h	[ARM] Add fallocate syscall entry	2007-10-12 23:43:31 +01:00
user.h	Sanitize the type of struct user.u_ar0	2008-02-07 08:42:30 -08:00
vfp.h	[ARM] 4583/1: ARMv7: Add VFPv3 support	2008-01-26 14:41:28 +00:00
vfpmacros.h	[ARM] 4583/1: ARMv7: Add VFPv3 support	2008-01-26 14:41:28 +00:00
vga.h
xor.h