1. 18 Mar, 2007 3 commits
    • Linus Torvalds's avatar
      Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · 98ae6878
      Linus Torvalds authored
      * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
        [ALSA] hda-intel - Fix HDA buffer alignment
        [ALSA] hda-codec - Add model for HP Compaq d5750
        [ALSA] hda-codec - Add support for MacBook Pro 1st generation
        [ALSA] version 1.0.14rc3
        [ALSA] hda-codec - Add model for HP Compaq d5700
        [ALSA] intel8x0 - Fix Oops at kdump crash kernel
        [ALSA] hda-codec - Fix speaker output on MacPro
        [ALSA] hda-codec - more systems for Analog Devices
        [ALSA] hda-intel - Fix codec probe with ATI contorllers
        [ALSA] hda-codec - Add suppoprt for Asus M2N-SLI motherboard
        [ALSA] intel8x0 - Fix speaker output after S2RAM
        [ALSA] ac97 - fix AD shared shared jack control logic
        [ALSA] soc - Fix dependencies in Kconfig files
      98ae6878
    • 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 37 commits