lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2006-10-03 16:35:11 -07:00
parent f3c87a8999 a847825970
commit 708e16892e
596 changed files with 1095 additions and 1333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/dec/prom/call_o32.S
View File

@ -1,5 +1,5 @@
/*
* arch/mips/dec/call_o32.S
* arch/mips/dec/prom/call_o32.S
*
* O32 interface for the 64 (or N32) ABI.
*

2
arch/mips/mm/tlbex.c
View File

@ -1211,7 +1211,7 @@ static void __init build_r4000_tlb_refill_handler(void)
* Overflow check: For the 64bit handler, we need at least one
* free instruction slot for the wrap-around branch. In worst
* case, if the intended insertion point is a delay slot, we
* need three, with the the second nop'ed and the third being
* need three, with the second nop'ed and the third being
* unused.
*/
#ifdef CONFIG_32BIT

2
arch/mips/pci/fixup-vr4133.c
View File

@ -1,5 +1,5 @@
/*
* arch/mips/vr41xx/nec-cmbvr4133/pci_fixup.c
* arch/mips/pci/fixup-vr4133.c
*
* The NEC CMB-VR4133 Board specific PCI fixups.
*

2
arch/mips/tx4938/common/irq.c
View File

@ -1,5 +1,5 @@
/*
* linux/arch/mps/tx4938/common/irq.c
* linux/arch/mips/tx4938/common/irq.c
*
* Common tx4938 irq handler
* Copyright (C) 2000-2001 Toshiba Corporation