1. 04 Oct, 2006 39 commits
  2. 03 Oct, 2006 1 commit
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 708e1689
      Linus Torvalds authored
      * 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
      708e1689