1. 13 Dec, 2006 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 775ba7ad
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
        Fix inotify maintainers entry
        Fix typo in new debug options.
        Jon needs a new shift key.
        fs: Convert kmalloc() + memset() to kzalloc() in fs/.
        configfs.h: Remove dead macro definitions.
        kconfig: Standardize "depends" -> "depends on" in Kconfig files
        e100: replace kmalloc with kcalloc
        um: replace kmalloc+memset with kzalloc
        fix typo in net/ipv4/ip_fragment.c
        include/linux/compiler.h: reject gcc 3 < gcc 3.2
        Kconfig: fix spelling error in config KALLSYMS help text
        Remove duplicate "have to" in comment
        Fix small typo in drivers/serial/icom.c
        Use consistent casing in help message
        EXT{2,3,4}_FS: remove outdated part of the help text
      775ba7ad
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · d9405057
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] pcwd_usb.c generic HID include file
        [WATCHDOG] watchdog miscdevice patch
        [WATCHDOG] rm9k_wdt: fix interrupt handler arguments
        [WATCHDOG] rm9k_wdt: fix compilation
      d9405057
  2. 12 Dec, 2006 38 commits