1. 22 Feb, 2008 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 · b8967d88
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
        PCI: Fix wrong reference counter check for proc_dir_entry
        PCI: fix up setup-bus.c #ifdef
        PCI: don't load acpi_php when acpi is disabled
        PCI: quirks: set 'En' bit of MSI Mapping for devices onHT-based nvidia platform
        PCI: kernel-doc: fix pci-acpi warning
        PCI: irq: patch for Intel ICH10 DeviceID's
        PCI: pci_ids: patch for Intel ICH10 DeviceID's
        PCI: AMD SATA IDE mode quirk
        PCI: drivers/pcmcia/i82092.c: fix up after pci_bus_region changes
        PCI: hotplug: acpiphp_ibm: Remove get device information
      b8967d88
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c6b08346
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (23 commits)
        ehci-fsl: add PPC_MPC837x to default y
        USB: POWERPC: ehci: fix ppc build
        USB: usb-storage: don't access beyond the end of the sg buffer
        USB: quirks and unusual_devs entry for Actions flash drive
        USB: usb-storage: unusual_devs entry for Oracom MP3 player
        USB: serial: move zte MF330 from sierra to option
        USB: add new vernier product id to ldusb.c
        USB: gadget: queue usb USB_CDC_GET_ENCAPSULATED_RESPONSE message
        USB: Add another Novatel U727 ID to the device table for usbserial
        USB: storage: Nikon D80 new FW still needs Fixup
        USB: usb-storage: don't clear-halt when Get-Max-LUN stalls
        USB: option: Added vendor id for Dell 5720 broadband modem
        USB: option: Add Kyocera KPC680 ids
        USB: quirks for known quirky audio devices
        USB: fix previous sparse fix which was incorrect
        USB: fix error handling in trancevibrator
        USB: g_printer, fix empty if statement
        USB: ehci-fsl: mpc834x config symbol is PPC_MPC834x, not MPC834x
        USB: fix usb open suspend race in cdc-acm
        USB: usb: yet another Dell wireless CDMA/EVDO modem
        ...
      c6b08346
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 5d637c4a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: update git tree in MAINTAINERS
        dlm: fix rcom_names message to self
      5d637c4a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 06165752
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 4835/1: Fix stale comment in struct machine_desc description
        [ARM] 4829/1: add .get method to pxa-cpufreq to silence a warning
        [ARM] 4828/1: fix 3 warnings in drivers/video/pxafb.c
        [ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c
        [ARM] 4826/1: Orion: Register the RTC interrupt on the TS-209
        [ARM] pxa: fix clock lookup to find specific device clocks
      06165752
    • Ian Campbell's avatar
      xen: Implement getgeo for Xen virtual block device. · 597592d9
      Ian Campbell authored
      The below implements the getgeo hook for Xen block devices. Extracted
      from the xen-unstable tree where it has been used for ages.
      
      It is useful to have because it allows things like grub2 (used by the
      Debian installer images) to work in a guest domain without having to
      sprinkle Xen specific hacks around the place.
      Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
      Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      597592d9
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 0f151e8b
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c
        [POWERPC] pasemi: Register i2c devices at boot
        [POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
        [POWERPC] Fix warning in pseries/power.c
        [POWERPC] Fix bootwrapper builds with older gcc versions
        [POWERPC] Fix dt_mem_next_cell() to read the full address
        [POWERPC] Kill sparse warnings in kprobes
        [POWERPC] spufs: fix scheduler starvation by idle contexts
        [POWERPC] 44x: Add multiplatform defconfig
        [POWERPC] 44x: Fix Kconfig formatting
        [POWERPC] 4xx: Update defconfigs for 2.6.25
        [POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
        [POWERPC] PPC440EP Interrupt Triggering and Level Settings
        [POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
      0f151e8b
  2. 21 Feb, 2008 34 commits