Linus Torvalds 72558dde73 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: (36 commits) ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup scc_pata: kill unused variables sgiioc4: kill duplicate ioremap() sgiioc4: kill useless address checks delkin_cb: add PM support ide: remove broken hpt34x driver ide-floppy: remove idefloppy_floppy_t typedef sgiioc4: remove maskproc() method hpt366: cleanup maskproc() method ide: mask interrupt in ide_config_drive_speed() hpt366: fix compile warning ide: remove unused macros from <asm-parisc/ide.h> ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h> ide: remove dead <asm-arm/arch-sa1100/ide.h> ide: fix support for IDE PCI controllers using MMIO on frv ide-cd: remove stale comment ide-cd: small drive type print fix ide-cd: debug log enhancements ide: add generic ATA/ATAPI disk driver ide: allow device drivers to specify per-device type /proc settings ...		2008-10-20 13:12:39 -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	aout: move STACK_TOP[_MAX] to asm/processor.h	2008-02-08 09:22:29 -08:00
adb_iop.h
amigahw.h	m68k/amiga/: possible cleanups	2008-07-20 17:24:39 -07:00
amigaints.h	m68k/amiga/: possible cleanups	2008-07-20 17:24:39 -07:00
amigayle.h
amipcmcia.h
apollodma.h	m68k: remove CVS keywords	2008-07-20 17:24:38 -07:00
apollohw.h	[PATCH] m68k: convert apollo irq code	2006-06-25 10:00:57 -07:00
atafd.h
atafdreg.h
atari_joystick.h
atari_stdma.h	IRQ: Use the new typedef for interrupt handler function pointers	2006-10-09 12:19:47 +01:00
atari_stram.h
atarihw.h	m68k: Remove the broken Hades support	2008-10-14 10:23:27 -07:00
atariints.h	further UTF-8 fixes and name correction	2007-05-11 19:09:46 +02:00
atarikb.h	m68k: Atari keyboard and mouse support.	2007-05-04 17:59:05 -07:00
atomic.h	atomic.h: atomic_add_unless as inline. Remove system.h atomic.h circular dependency	2007-05-08 11:15:20 -07:00
auxvec.h	[PATCH] auxiliary vector cleanups	2005-09-07 16:57:21 -07:00
bitops.h	m68k: Add ext2_find_{first,next}_bit() for ext4	2008-06-12 18:05:39 -07:00
blinken.h
bootinfo.h
bug.h	m68k: Make gcc aware that BUG() does not return	2008-05-18 13:28:48 -07:00
bugs.h
bvme6000hw.h	[PATCH] m68k: convert VME irq code	2006-06-25 10:00:58 -07:00
byteorder.h
cache.h	[PATCH] Kill L1_CACHE_SHIFT_MAX	2006-01-08 20:13:39 -08:00
cachectl.h
cacheflush.h	[PATCH] Optimize D-cache alias handling on fork	2006-12-13 09:27:08 -08:00
checksum.h	[NET]: M68K checksum annotations and cleanups.	2006-12-02 21:23:07 -08:00
contregs.h	m68k: some asm-sparc include files moved	2008-08-04 17:16:20 -07:00
cputime.h
current.h
delay.h
device.h	Driver core: add dev_archdata to struct device	2006-12-01 14:52:01 -08:00
div64.h	rename div64_64 to div64_u64	2008-05-01 08:03:58 -07:00
dma-mapping.h	m68k: Add missing dma_sync_single_range_for_{cpu,device}()	2008-10-14 10:23:27 -07:00
dma.h	m68k: remove the dead PCI code	2008-10-14 10:23:27 -07:00
dsp56k.h	[PATCH] m68k: dsp56k __user annotations	2006-01-12 09:09:04 -08:00
dvma.h	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	2008-07-24 10:47:21 -07:00
elf.h	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
emergency-restart.h	[PATCH] Add emergency_restart()	2005-07-26 14:35:41 -07:00
entry.h	m68k: Remove the broken Hades support	2008-10-14 10:23:27 -07:00
errno.h
fb.h	fbdev: detect primary display device	2007-07-17 10:23:11 -07:00
fbio.h	m68k: some asm-sparc include files moved	2008-08-04 17:16:20 -07:00
fcntl.h	[PATCH] Clean up struct flock64 definitions	2005-09-07 16:57:38 -07:00
floppy.h	cleanup floppy.h	2007-10-17 08:42:55 -07:00
fpu.h	m68k: Allow no CPU/platform type for allnoconfig	2008-07-20 17:24:38 -07:00
futex.h	[PATCH] consolidate asm/futex.h	2006-01-08 20:13:39 -08:00
hardirq.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
hp300hw.h
hw_irq.h
hwtest.h
ide.h	ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>	2008-10-17 18:09:15 +02:00
idprom.h	m68k: some asm-sparc include files moved	2008-08-04 17:16:20 -07:00
intersil.h
io.h	m68k: remove the dead PCI code	2008-10-14 10:23:27 -07:00
ioctl.h	[PATCH] Generic ioctl.h	2006-01-10 08:01:34 -08:00
ioctls.h	m68k: Enable arbitary speed tty support	2007-08-22 19:52:45 -07:00
ipcbuf.h
irq_regs.h	[PATCH] m68k pt_regs fixes, part 2	2006-10-08 12:32:35 -07:00
irq.h	m68k: Allow no CPU/platform type for allnoconfig	2008-07-20 17:24:38 -07:00
Kbuild	m68k: Export cachectl.h	2007-10-13 09:41:03 -07:00
kdebug.h	move die notifier handling to common code	2007-05-08 11:15:04 -07:00
kmap_types.h
linkage.h
local.h
mac_asc.h
mac_baboon.h	m68k/mac/: possible cleanups	2008-07-20 17:24:39 -07:00
mac_iop.h	[PATCH] m68k pt_regs fixes	2006-10-07 10:51:14 -07:00
mac_mouse.h
mac_oss.h	[PATCH] m68k: convert mac irq code	2006-06-25 10:00:58 -07:00
mac_psc.h
mac_via.h	m68k/mac/: possible cleanups	2008-07-20 17:24:39 -07:00
machdep.h	IRQ: Use the new typedef for interrupt handler function pointers	2006-10-09 12:19:47 +01:00
machines.h	m68k/sun3/: possible cleanups	2008-07-20 17:24:39 -07:00
machw.h	m68k: remove old mac_esp cruft	2008-05-05 12:38:50 -07:00
macintosh.h	m68k/mac/: possible cleanups	2008-07-20 17:24:39 -07:00
macints.h	[PATCH] m68k: convert mac irq code	2006-06-25 10:00:58 -07:00
math-emu.h	[PATCH] m68k: work around binutils tokenizer change	2007-02-11 10:51:20 -08:00
mc146818rtc.h	[PATCH] rtc-cmos needs RTC_ALWAYS_BCD known	2007-03-14 15:27:49 -07:00
md.h	m68k: remove CVS keywords	2008-07-20 17:24:38 -07:00
mman.h	[PATCH] add asm-generic/mman.h	2006-02-15 15:32:22 -08:00
mmu_context.h	[PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction	2007-05-02 19:27:14 +02:00
mmu.h
mmzone.h	m68k: discontinuous memory support	2007-05-31 07:58:14 -07:00
module.h	m68k: discontinuous memory support	2007-05-31 07:58:14 -07:00
motorola_pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
motorola_pgtable.h	mm: introduce pte_special pte bit	2008-04-28 08:58:23 -07:00
movs.h
msgbuf.h
mutex.h	[PATCH] mutex subsystem, add default include/asm-*/mutex.h files	2006-01-09 15:59:19 -08:00
mvme16xhw.h	[PATCH] m68k: convert VME irq code	2006-06-25 10:00:58 -07:00
mvme147hw.h	[PATCH] m68k: convert VME irq code	2006-06-25 10:00:58 -07:00
nubus.h
openprom.h	m68k: remove CVS keywords	2008-07-20 17:24:38 -07:00
oplib.h	m68k: remove AP1000 code	2008-07-20 17:24:38 -07:00
page_offset.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
page.h	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	2008-07-24 10:47:21 -07:00
param.h	avoid overflows in kernel/time.c	2008-02-08 09:22:39 -08:00
parport.h
pci.h	m68k: remove the dead PCI code	2008-10-14 10:23:27 -07:00
percpu.h
pgalloc.h	m68k: discontinuous memory support	2007-05-31 07:58:14 -07:00
pgtable.h	cleanup after APUS removal	2008-02-06 10:41:01 -08:00
poll.h	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
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
ptrace.h
q40_master.h
q40ints.h
raw_io.h	m68k {in,out}_le{16,32} endianness misannotation	2007-07-26 11:11:57 -07:00
resource.h
rtc.h	fix file specification in comments	2006-10-03 23:01:26 +02:00
sbus.h	m68k: remove stale ARCH_SUN4 #define	2008-07-20 17:24:39 -07:00
scatterlist.h	Add CONFIG_DEBUG_SG sg validation	2007-10-22 21:20:03 +02:00
sections.h
segment.h
sembuf.h
serial.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
setup.h	m68k: export m68k_mmutype	2008-05-18 13:28:50 -07:00
shm.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h	[PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h)	2006-10-08 12:32:36 -07:00
socket.h	[NET]: Introducing socket mark socket option.	2008-01-31 19:27:19 -08:00
sockios.h	[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution	2007-04-25 22:24:04 -07:00
spinlock.h
stat.h	[PATCH] 2TB files: st_blocks is invalid when calling stat64	2006-03-26 08:57:00 -08:00
statfs.h
string.h	[PATCH] m68k: cleanup string functions	2006-10-06 08:53:40 -07:00
sun3_pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
sun3_pgtable.h	mm: introduce pte_special pte bit	2008-04-28 08:58:23 -07:00
sun3-head.h	m68k: remove CVS keywords	2008-07-20 17:24:38 -07:00
sun3ints.h	[PATCH] Sun3: General updates	2006-12-09 09:41:18 -08:00
sun3mmu.h	[PATCH] sun3_ioremap() prototype	2006-10-15 11:00:58 -07:00
sun3x.h
sun3xflop.h	[PATCH] m68k pt_regs fixes	2006-10-07 10:51:14 -07:00
sun3xprom.h
suspend.h
system.h	Add cmpxchg_local to m86k	2008-02-07 08:42:32 -08:00
termbits.h	m68k: Enable arbitary speed tty support	2007-08-22 19:52:45 -07:00
termios.h	m68k: Enable arbitary speed tty support	2007-08-22 19:52:45 -07:00
thread_info.h	container freezer: add TIF_FREEZE flag to all architectures	2008-10-20 08:52:33 -07:00
timex.h
tlb.h
tlbflush.h	m68k: Allow no CPU/platform type for allnoconfig	2008-07-20 17:24:38 -07:00
topology.h
traps.h	[PATCH] m68k: convert generic irq code to irq controller	2006-06-25 10:00:57 -07:00
types.h	m68k: types: use <asm-generic/int-*.h> for the m68k architecture	2008-05-02 16:18:28 -07:00
uaccess.h	m68k: Convert access_ok() to an inline function	2008-05-18 13:28:48 -07:00
ucontext.h
unaligned.h	kernel: Move arches to use common unaligned access	2008-04-29 08:06:27 -07:00
unistd.h	m68k{,nommu}: Wire up new system calls	2008-08-11 10:37:34 -07:00
user.h	Sanitize the type of struct user.u_ar0	2008-02-07 08:42:30 -08:00
virtconvert.h	m68k: Remove the broken Hades support	2008-10-14 10:23:27 -07:00
xor.h
zorro.h	[PATCH] m68k: basic iomem annotations	2006-01-12 09:09:02 -08:00