1. 13 Dec, 2006 6 commits
    • Andrew Morton's avatar
      [PATCH] arch/i386/kernel/smpboot.c: remove unneeded ifdef · 24d34dc5
      Andrew Morton authored
      #ifdef CONFIG_SMP in a file which isn't compiled in non-SMP kernels.
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      24d34dc5
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 445722f9
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] kprobe clears qp bits for special instructions
        [IA64] enable trap code on slot 1
        [IA64] Take defensive stance on ia64_pal_get_brand_info()
        [IA64] fix possible XPC deadlock when disconnecting
        [IA64] - Reduce overhead of FP exception logging messages
        [IA64] fix arch/ia64/mm/contig.c:235: warning: unused variable `nid'
        [IA64] s/termios/ktermios/ in simserial.c
        [IA64] kexec/kdump: tidy up declaration of relocate_new_kernel_t
        [IA64] Kexec/Kdump: honour non-zero crashkernel offset.
        [IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations
        [IA64] Do not call SN_SAL_SET_CPU_NUMBER twice on cpu 0
      445722f9
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart · 3641b536
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
        [AGPGART] VIA and SiS AGP chipsets are x86-only
        [AGPGART] agp-amd64: section mismatches with HOTPLUG=n
        [AGPGART] Fix up misprogrammed bridges with incorrect AGPv2 rates.
      3641b536
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · b1ef951e
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IPoIB: Make sure struct ipoib_neigh.queue is always initialized
        IB/iser: Use the new verbs DMA mapping functions
        IB/srp: Use new verbs IB DMA mapping functions
        IPoIB: Use the new verbs DMA mapping functions
        IB/core: Use the new verbs DMA mapping functions
        IB/ipath: Implement new verbs DMA mapping functions
        IB: Add DMA mapping functions to allow device drivers to interpose
        RDMA/cma: Export rdma cm interface to userspace
        RDMA/cma: Add support for RDMA_PS_UDP
        RDMA/cma: Allow early transition to RTS to handle lost CM messages
        RDMA/cma: Report connect info with connect events
        RDMA/cma: Remove unneeded qp_type parameter from rdma_cm
        IB/ipath: Fix IRQ for PCI Express HCAs
        RDMA/amso1100: Fix memory leak in c2_qp_modify()
        IB/iser: Remove unused "write-only" variables
        IB/ipath: Remove unused "write-only" variables
        IB/fmr: ib_flush_fmr_pool() may wait too long
      b1ef951e
    • 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 34 commits