1. 21 Dec, 2006 6 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · de9b2fcc
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (22 commits)
        acpiphp: Link-time error for PCI Hotplug
        shpchp: cleanup shpchp.h
        shpchp: remove shpchprm_get_physical_slot_number
        shpchp: cleanup struct controller
        shpchp: remove unnecessary struct php_ctlr
        PCI: ATI sb600 sata quirk
        PCI legacy resource fix
        PCI: don't export device IDs to userspace
        PCI: Be a bit defensive in quirk_nvidia_ck804() so we don't risk dereferencing a NULL pdev.
        PCI: Fix multiple problems with VIA hardware
        PCI: Only check the HT capability bits in mpic.c
        PCI: Use pci_find_ht_capability() in drivers/pci/quirks.c
        PCI: Add #defines for Hypertransport MSI fields
        PCI: Use pci_find_ht_capability() in drivers/pci/htirq.c
        PCI: Add pci_find_ht_capability() for finding Hypertransport capabilities
        PCI: Create __pci_bus_find_cap_start() from __pci_bus_find_cap()
        pci: Introduce pci_find_present
        PCI: pcieport-driver: remove invalid warning message
        rpaphp: compiler warning cleanup
        PCI quirks: remove redundant check
        ...
      de9b2fcc
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · fb34d203
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (34 commits)
        USB Storage: remove duplicate Nokia entry in unusual_devs.h
        [PATCH] bluetooth: add support for another Kensington dongle
        [PATCH] usb serial: add support for Novatel S720/U720 CDMA/EV-DO modems
        [PATCH] USB: Nokia E70 is an unusual device
        USB: fix to usbfs_snoop logging of user defined control urbs
        USB: at91_udc: Additional checks
        USB: at91_udc: Cleanup variables after failure in usb_gadget_register_driver()
        USB: at91_udc: allow drivers that support high speed
        USB: u132-hcd/ftdi-elan: add support for Option GT 3G Quad card
        USB: at91_udc, misc fixes
        USB: at91 udc, support at91sam926x addresses
        USB: OHCI support for PNX8550
        USB: ohci handles hardware faults during root port resets
        USB: ohci at91 warning fix
        USB: ohci whitespace/comment fixups
        USB: MAINTAINERS update, EHCI and OHCI
        USB: gadget driver unbind() is optional; section fixes; misc
        UHCI: module parameter to ignore overcurrent changes
        USB: Nokia E70 is an unusual device
        USB AUERSWALD: replace kmalloc+memset with kzalloc
        ...
      fb34d203
    • Linus Torvalds's avatar
      Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · 5576d187
      Linus Torvalds authored
      * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix register save area alignment for swapcontext syscall
        [POWERPC] Fix PCI device channel state initialization
        [POWERPC] Update MTD OF documentation
        [POWERPC] Probe Efika platform before CHRP.
        [POWERPC] Fix build of cell zImage.initrd
        [POWERPC] iSeries: fix CONFIG_VIOPATH dependency
        [POWERPC] iSeries: fix viocons init
        [POWERPC] iSeries: fix viocd init
        [POWERPC] iSeries: fix iseries_veth init
        [POWERPC] iSeries: fix viotape init
        [POWERPC] iSeries: fix viodasd init
        [POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges
        [POWERPC] powerpc: add scanning of ebc bus to of_platform
        [POWERPC] spufs: fix assignment of node numbers
        [POWERPC] cell: Fix spufs with "new style" device-tree
        [POWERPC] cell: Enable spider workarounds on all PCI buses
        [POWERPC] cell: add forward struct declarations to spu.h
        [POWERPC] cell: update cell_defconfig
      5576d187
    • Linus Torvalds's avatar
      Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 · ee2fae03
      Linus Torvalds authored
      * 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm: Stop defining pci_pretty_name
        drm: r128: comment aligment with drm git
        drm: make kernel context switch same as for drm git tree.
        drm: fixup comment header style
        drm: savage: compat fix from drm git.
        drm: Unify radeon offset checking.
        i915_vblank_tasklet: Try harder to avoid tearing.
        DRM: handle pci_enable_device failure
        drm: fix return value check
      ee2fae03
    • Linus Torvalds's avatar
      Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · e4ddc9cc
      Linus Torvalds authored
      * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (30 commits)
        [ALSA] version 1.0.14rc1
        [ALSA] ac97: Identify CMI9761 chips.
        [ALSA] ac97_codec - trivial fix for bit update functions
        [ALSA] snd-ca0106: Fix typos.
        [ALSA] snd-ca0106: Add new card variant.
        [ALSA] sound: fix PCM substream list
        [ALSA] sound: initialize rawmidi substream list
        [ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2
        [ALSA] Remove IRQF_DISABLED for shared PCI irqs
        [ALSA] Fix invalid assignment of PCI revision
        [ALSA] Fix races in PCM OSS emulation
        [ALSA] hda-codec - fix typo in PCI IDs
        [ALSA] ac97 - Fix potential negative array index
        [ALSA] hda-codec - Verbose proc output for PCM parameters
        [ALSA] hda-codec - Fix detection of supported sample rates
        [ALSA] hda-codec - Fix model for ASUS V1j laptop
        [ALSA] sound/core/control.c: remove dead code
        [ALSA] hda-codec - Add model for HP q965
        [ALSA] pcm core: fix silence_start calculations
        [ALSA] hda-codec - Fix a typo
        ...
      e4ddc9cc
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · eb2112fb
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (29 commits)
        [ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC
        [ARM] 4060/1: update several ARM defconfigs
        [ARM] 4061/1: xsc3: change of maintainer
        [ARM] 4059/1: VR1000: fix LED3's platform device number
        [ARM] 4022/1: iop13xx: generic irq fixups
        [ARM] 4015/1: s3c2410 cpu ifdefs
        [ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency
        [ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup
        [ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc
        [ARM] 4054/1: ep93xx: add HWCAP_CRUNCH
        [ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig
        [ARM] Fix warnings from asm/system.h
        [ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support
        [ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410
        [ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h
        [ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static
        [ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410
        [ARM] 4045/1: S3C24XX: remove old VA for non-shared areas
        [ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c
        [ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c
        ...
      eb2112fb
  2. 20 Dec, 2006 34 commits