1. 02 11月, 2010 2 次提交
  2. 01 11月, 2010 23 次提交
  3. 30 10月, 2010 10 次提交
  4. 29 10月, 2010 5 次提交
    • L
      Merge branch 'x86-platform-for-linus' of... · 2d3b07c0
      Linus Torvalds 提交于
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Move olpc to platform
        x86: Move uv to platform
        x86: Move mrst to platform
        x86: Move scx200 to platform
        x86: Move visws to platform
        x86: Move efi to platform
        x86: Move sfi to platform
        x86: Add platform directory
      2d3b07c0
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 150cd843
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (68 commits)
        hwmon: (it87) Add support for the IT8721F/IT8758E
        hwmon: (it87) Move conversion functions
        hwmon: Remove many EXPERIMENTAL flags
        hwmon: (lm85) Add support for ADT7468 high-frequency PWM mode
        hwmon: (lm85) Document the ADT7468 as supported
        hwmon: (lm85) Fix ADT7468 frequency table
        hwmon: I2C addresses are constant
        Move ams driver to macintosh
        hwmon: (pcf8591) Don't attempt to detect devices
        hwmon: (pcf8591) Register as a hwmon device
        hwmon: (w83795) Use standard attributes for chassis intrusion
        hwmon: (w83795) Exclude fan control feature by default
        hwmon: (w83795) Add myself as co-author and maintainer
        hwmon: (w83795) More style cleanups
        hwmon: (w83795) Fix LSB reading of voltage limits
        hwmon: (w83795) Use dev_get_drvdata() where possible
        hwmon: (w83795) Delay reading pwm config registers
        hwmon: (w83795) Delay reading limit registers
        hwmon: (w83795) Move register reads to dedicated functions
        hwmon: (w83795) Pack similar register reads
        ...
      150cd843
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · f063a0c0
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits)
        Staging: brcm80211: fix usage of roundup in structures
        Staging: bcm: fix up network device reference counting
        Staging: keucr: fix up US_ macro change
        staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
        staging: brcm80211: Remove unnecessary header files.
        staging: brcm80211: Remove unnecessary includes from bcmutils.c
        staging: brcm80211: Removed unnecessary pktsetprio() function.
        Staging: brcm80211: remove typedefs.h
        Staging: brcm80211: remove uintptr typedef usage
        Staging: hv: remove struct vmbus_channel_interface
        Staging: hv: remove Open from struct vmbus_channel_interface
        Staging: hv: storvsc: call vmbus_open directly
        Staging: hv: netvsc: call vmbus_open directly
        Staging: hv: channel: export vmbus_open to modules
        Staging: hv: remove Close from struct vmbus_channel_interface
        Staging: hv: netvsc: call vmbus_close directly
        Staging: hv: storvsc: call vmbus_close directly
        Staging: hv: channel: export vmbus_close to modules
        Staging: hv: remove SendPacket from struct vmbus_channel_interface
        Staging: hv: storvsc: call vmbus_sendpacket directly
        ...
      
      Fix up conflicts in
      	drivers/staging/cx25821/cx25821-audio-upstream.c
      	drivers/staging/cx25821/cx25821-audio.h
      due to warring whitespace cleanups (neither of which were all that great)
      f063a0c0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 3c376295
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (32 commits)
        sh: intc: switch irq_desc iteration to new active IRQ iterator.
        sh: fix up cpu hotplug IRQ migration for irq_data changes.
        sh: oprofile: Make sure the backtrace op is available for timer-fallback.
        sh64: oprofile: Fix up kernel stack pointer size mismatch.
        sh: oprofile: Fix up and extend op_name_from_perf_id().
        sh: lockless get_user_pages_fast()
        sh64: _PAGE_SPECIAL support.
        sound: sh: ctrl_in/outX to __raw_read/writeX conversion.
        sh: disable deprecated genirq support.
        sh: update show_interrupts() for irq_data chip lookup.
        sh: intc: irq_data conversion.
        sh64: irq_data conversion.
        sh64: update for IRQ flag handling naming changes.
        rtc: rtc-rs5c313: ctrl_in/outX to __raw_read/writeX conversion.
        sh: mach-se: irq_data conversion.
        input: hp680_ts_input: ctrl_in/outX to __raw_read/writeX conversion.
        input: jornada680_kbd: ctrl_in/outX to __raw_read/writeX conversion.
        sh: hd64461: irq_data conversion.
        sh: mach-x3proto: irq_data conversion.
        sh: mach-systemh: irq_data conversion.
        ...
      3c376295
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · e9f29c9a
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
        x86: allocate space within a region top-down
        x86: update iomem_resource end based on CPU physical address capabilities
        x86/PCI: allocate space from the end of a region, not the beginning
        PCI: allocate bus resources from the top down
        resources: support allocating space within a region from the top down
        resources: handle overflow when aligning start of available area
        resources: ensure callback doesn't allocate outside available space
        resources: factor out resource_clip() to simplify find_resource()
        resources: add a default alignf to simplify find_resource()
        x86/PCI: MMCONFIG: fix region end calculation
        PCI: Add support for polling PME state on suspended legacy PCI devices
        PCI: Export some PCI PM functionality
        PCI: fix message typo
        PCI: log vendor/device ID always
        PCI: update Intel chipset names and defines
        PCI: use new ccflags variable in Makefile
        PCI: add PCI_MSIX_TABLE/PBA defines
        PCI: add PCI vendor id for STmicroelectronics
        x86/PCI: irq and pci_ids patch for Intel Patsburg DeviceIDs
        PCI: OLPC: Only enable PCI configuration type override on XO-1
        ...
      e9f29c9a