1. 26 Oct, 2006 3 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 8c8a0eab
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        [CRYPTO] users: Select ECB/CBC where needed
      8c8a0eab
    • Linus Torvalds's avatar
      Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · 8483ca3c
      Linus Torvalds authored
      * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Make sure __cpu_preinit_ppc970 gets called on 970GX processors
        [POWERPC] Fix CHRP platforms with only 8259
        [POWERPC] IPIC: Fix spinlock recursion in set_irq_handler
        [POWERPC] Fix the UCC rx/tx clock of QE
        [POWERPC] cell: update defconfig
        [POWERPC] spufs: fix another off-by-one bug in spufs_mbox_read
        [POWERPC] spufs: fix signal2 file to report signal2
        [POWERPC] Fix device_is_compatible() const warning
        [POWERPC] Cell timebase bug workaround
        [POWERPC] Support feature fixups in modules
        [POWERPC] Support feature fixups in vdso's
        [POWERPC] Support nested cpu feature sections
        [POWERPC] Consolidate feature fixup code
        [POWERPC] Fix hang in start_ldr if _end or _edata is unaligned
        [POWERPC] Fix spelling errors in ucc_fast.c and ucc_slow.c
        [POWERPC] Don't require execute perms on wrapper when building zImage.initrd
        [POWERPC] Add 970GX cputable entry
        [POWERPC] Fix build breakage with CONFIG_PPC32
        [POWERPC] Fix compiler warning message on get_property call
        [POWERPC] Simplify stolen time calculation
      8483ca3c
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · ede847c4
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3902/1: Enable GPIO81-84 on PXA255
        [ARM] Comment out missing configuration symbols
        [ARM] 3898/1: corgi_bl fix module loading
        [ARM] 3897/1: corgi_bl fix module compiling
        [ARM] Fix breakage in 7281c248
      ede847c4
  2. 25 Oct, 2006 21 commits
  3. 24 Oct, 2006 11 commits
  4. 23 Oct, 2006 5 commits
    • Linus Torvalds's avatar
      Linux 2.6.19-rc3 · 7059abed
      Linus Torvalds authored
      7059abed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 6d03a68e
      Linus Torvalds authored
      * 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
    • Linus Torvalds's avatar
      Revert unintentional and bogus change to drivers/pci/quirks.c · 0c0e4668
      Linus Torvalds authored
      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: default avatarLinus Torvalds <torvalds@osdl.org>
      0c0e4668
    • Russell King's avatar
      [PATCH] Remove __must_check for device_for_each_child() · 04fed361
      Russell King authored
      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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      04fed361
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa · dee6515b
      Linus Torvalds authored
      * '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