1. 25 10月, 2006 5 次提交
  2. 24 10月, 2006 5 次提交
    • L
      Linux 2.6.19-rc3 · 7059abed
      Linus Torvalds 提交于
      7059abed
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 6d03a68e
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (33 commits)
        [WATCHDOG] remove experimental on iTCO_wdt.c
        [WATCHDOG] Atmel AT91RM9200 rename.
        [WATCHDOG] includes for sample watchdog program.
        [WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning
        [WATCHDOG] add ich8 support to iTCO_wdt.c (patch 2)
        [WATCHDOG] add ich8 support to iTCO_wdt.c
        [WATCHDOG] ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
        [WATCHDOG] w83697hf/hg WDT driver - Kconfig patch
        [WATCHDOG] w83697hf/hg WDT driver - autodetect patch
        [WATCHDOG] w83697hf/hg WDT driver - patch 16
        [WATCHDOG] w83697hf/hg WDT driver - patch 15
        [WATCHDOG] w83697hf/hg WDT driver - patch 14
        [WATCHDOG] w83697hf/hg WDT driver - patch 13
        [WATCHDOG] w83697hf/hg WDT driver - patch 12
        [WATCHDOG] w83697hf/hg WDT driver - patch 11
        [WATCHDOG] w83697hf/hg WDT driver - patch 10
        [WATCHDOG] w83697hf/hg WDT driver - patch 9
        [WATCHDOG] w83697hf/hg WDT driver - patch 8
        [WATCHDOG] w83697hf/hg WDT driver - patch 7
        [WATCHDOG] w83697hf/hg WDT driver - patch 6
        ...
      6d03a68e
    • L
      Revert unintentional and bogus change to drivers/pci/quirks.c · 0c0e4668
      Linus Torvalds 提交于
      In commit 4e8a5201 ("[PKT_SCHED] netem:
      Orphan SKB when adding to queue.") Davem mistakenly also included a
      temporary diff in his tree that disabled the pci_fixup_video VGA quirk,
      which broke sparc64.
      
      This reverts that part of the commit. Sayeth Davem:
      
        "Greg KH has a patch coming to you soon which will move that VGA code
         back into x86/x86_64/IA64 specific areas and will fix the sparc64
         problem properly."
      
      Special thanks to Claudio Martins <ctpm@ist.utl.pt> for noticing the
      error in the first place.
      
      Cc: Claudio Martins <ctpm@ist.utl.pt>
      Cc: David Miller <davem@davemloft.net>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      0c0e4668
    • R
      [PATCH] Remove __must_check for device_for_each_child() · 04fed361
      Russell King 提交于
      Eliminate more __must_check madness.
      
      The return code from device_for_each_child() depends on the values
      which the helper function returns.  If the helper function always
      returns zero, it's utterly pointless to check the return code from
      device_for_each_child().
      
      The only code which knows if the return value should be checked is
      the caller itself, so forcing the return code to always be checked
      is silly.  Hence, remove the __must_check annotation.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      04fed361
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa · dee6515b
      Linus Torvalds 提交于
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa:
        [ALSA] hda-intel - Add check of MSI availabity
        [ALSA] version 1.0.13
        [ALSA] Fix addition of user-defined boolean controls
        [ALSA] Fix AC97 power-saving mode
        [ALSA] Fix re-use of va_list
        [ALSA] hda_intel: add ATI RS690 HDMI audio support
        [ALSA] hda-codec - Add model entry for ASUS U5F laptop
        [ALSA] Fix dependency of snd-adlib driver in Kconfig
        [ALSA] Various fixes for suspend/resume of ALSA PCI drivers
        [ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs
        [ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value
        [ALSA] sound/isa/ad1816a/ad1816a.c: check kmalloc() return value
        [ALSA] sound/isa/cmi8330.c: check kmalloc() return value
        [ALSA] sound/isa/gus/interwave.c: check kmalloc() return value
      dee6515b
  3. 23 10月, 2006 8 次提交
  4. 22 10月, 2006 22 次提交