Linus Torvalds 708e16892e Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial ... * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits) Add missing maintainer countries in CREDITS Fix bytes <-> kilobytes typo in Kconfig for ramdisk fix a typo in Documentation/pi-futex.txt BUG_ON conversion for fs/xfs/ BUG_ON() conversion in fs/nfsd/ BUG_ON conversion for fs/reiserfs BUG_ON cleanups in arch/i386 BUG_ON cleanup in drivers/net/tokenring/ BUG_ON cleanup for drivers/md/ kerneldoc-typo in led-class.c debugfs: spelling fix rcutorture: Fix incorrect description of default for nreaders parameter parport: Remove space in function calls Michal Wronski: update contact info Spelling fix: "control" instead of "cotrol" reboot parameter in Documentation/kernel-parameters.txt Fix copy&waste bug in comment in scripts/kernel-doc remove duplicate "until" from kernel/workqueue.c ite_gpio fix tabbage fix file specification in comments ... Fixed trivial path conflicts due to removed files: arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c		2006-10-03 16:35:11 -07:00
..
arm	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cris	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
h8300	fix file specification in comments	2006-10-03 23:01:26 +02:00
legacy	[PATCH] ide-cs (CompactFlash) driver, rm irq warning	2006-10-03 08:04:09 -07:00
mips	[PATCH] Alchemy: Delete unused pt_regs * argument from au1xxx_dbdma_chan_alloc	2006-09-26 08:48:54 -07:00
pci	[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.	2006-10-03 17:59:17 +01:00
ppc	fix file specification in comments	2006-10-03 23:01:26 +02:00
ide-cd.c	[PATCH] Split struct request ->flags into two parts	2006-09-30 20:23:37 +02:00
ide-cd.h	[PATCH] ide-cd: remove write-only cmd field from struct cdrom_info	2005-12-15 02:20:49 +01:00
ide-disk.c	[PATCH] Split struct request ->flags into two parts	2006-09-30 20:23:37 +02:00
ide-dma.c	[PATCH] ide: remove dma_base2 field from ide_hwif_t	2006-10-03 08:04:08 -07:00
ide-floppy.c	[PATCH] Remove ->rq_status from struct request	2006-09-30 20:29:23 +02:00
ide-generic.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ide-io.c	[PATCH] ide: reprogram disk pio timings on resume	2006-10-03 08:04:08 -07:00
ide-iops.c	[PATCH] ide: Fix crash on repeated reset	2006-10-03 08:04:08 -07:00
ide-lib.c	[PATCH] ide_dma_speed() fixes	2006-10-03 08:04:07 -07:00
ide-pnp.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ide-probe.c	[PATCH] IDE core: driver layer error checking	2006-10-03 08:04:08 -07:00
ide-proc.c	[PATCH] IDE core: driver layer error checking	2006-10-03 08:04:08 -07:00
ide-tape.c	[PATCH] completions: lockdep annotate on stack completions	2006-10-01 00:39:24 -07:00
ide-taskfile.c	[PATCH] Split struct request ->flags into two parts	2006-09-30 20:23:37 +02:00
ide-timing.h	[PATCH] ide: actually honor drive's minimum PIO/DMA cycle times	2006-06-26 09:58:27 -07:00
ide.c	[PATCH] ide: Fix crash on repeated reset	2006-10-03 08:04:08 -07:00
Kconfig	[MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.	2006-10-03 17:59:17 +01:00
Makefile	[IDE] Add driver for Sibyte Swarm evaluation board	2005-11-17 16:23:50 +00:00
setup-pci.c	[PATCH] drivers/ide/: cleanups	2006-10-03 08:04:08 -07:00