1. 18 Mar, 2007 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · b720a3be
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Use Kconfig.preempt
      b720a3be
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 2f8dd850
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide: remove CONFIG_IDEDMA_{ICS,PCI}_AUTO config options
        ide: don't allow DMA to be enabled if CONFIG_IDEDMA_{ICS,PCI}_AUTO=n
        scc_pata: dependency fix
        jmicron: make ide jmicron driver play nice with libata ones
        ide: remove static prototypes from include/asm-mips/mach-au1x00/au1xxx_ide.h
        ide: au1xxx: fix use of mixed declarations and code
        cmd64x: fix recovery time calculation (take 3)
      2f8dd850
  2. 17 Mar, 2007 38 commits