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
..
acquirewdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
advantechwdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
alim1535_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
alim7101_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
at91_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
booke_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
cpu5wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
ep93xx_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
eurotechwdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
i8xx_tco.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
i8xx_tco.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
i6300esb.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
ib700wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
ibmasr.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
indydog.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
iTCO_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-03 22:51:18 +02:00
ixp4xx_wdt.c	fix file specification in comments	2006-10-03 23:01:26 +02:00
ixp2000_wdt.c	fix file specification in comments	2006-10-03 23:01:26 +02:00
Kconfig	[WATCHDOG] iTCO_wdt (Intel TCO Timer) driver	2006-10-03 21:34:29 +02:00
machzwd.c	[WATCHDOG] improve machzwd detection	2006-10-02 23:14:38 +02:00
Makefile	[WATCHDOG] iTCO_wdt (Intel TCO Timer) driver	2006-10-03 21:34:29 +02:00
mixcomwd.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
mpc8xx_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
mpc83xx_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
mpcore_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
mv64x60_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
omap_wdt.c	[PATCH] OMAP: Add Watchdog driver support	2006-09-29 09:18:07 -07:00
omap_wdt.h	[PATCH] OMAP: Add Watchdog driver support	2006-09-29 09:18:07 -07:00
pcwd_pci.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
pcwd_usb.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
pcwd.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
pnx4008_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-03 22:51:18 +02:00
s3c2410_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
sa1100_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
sbc60xxwdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
sbc8360.c	[PATCH] SBC8360: module_param() permission fixes	2006-09-01 11:39:08 -07:00
sbc_epx_c3.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
sc520_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
sc1200wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
scx200_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
shwdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
softdog.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
w83627hf_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
w83877f_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
w83977f_wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
wafer5823wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
wd501p.h	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
wdrtas.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
wdt285.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
wdt977.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
wdt_pci.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00
wdt.c	[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()	2006-10-02 23:08:34 +02:00