linux/arch/mips/dec
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
..
prom fix file specification in comments 2006-10-03 23:01:26 +02:00
ecc-berr.c Use physical addresses at the interface level, letting drivers remap 2005-10-29 19:31:35 +01:00
int-handler.S Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ioasic-irq.c [MIPS] Eleminate interrupt migration helper use. 2006-07-13 21:25:58 +01:00
kn01-berr.c Use physical addresses at the interface level, letting drivers remap 2005-10-29 19:31:35 +01:00
kn02-irq.c [MIPS] Eleminate interrupt migration helper use. 2006-07-13 21:25:58 +01:00
kn02xa-berr.c Use physical addresses at the interface level, letting drivers remap 2005-10-29 19:31:35 +01:00
Makefile System-specific handling of bus errors for DECstation variations 2005-10-29 19:31:30 +01:00
promcon.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
reset.c Deal with the bloody KSEG vs CKSEG horror... 2005-10-29 19:31:23 +01:00
setup.c [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
time.c [MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME. 2006-10-03 17:59:18 +01:00
wbflush.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00