1. 26 1月, 2012 1 次提交
  2. 25 1月, 2012 4 次提交
  3. 21 1月, 2012 1 次提交
  4. 20 1月, 2012 6 次提交
  5. 14 1月, 2012 3 次提交
  6. 13 1月, 2012 4 次提交
  7. 11 1月, 2012 11 次提交
    • L
      Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux · 1a464cbb
      Linus Torvalds 提交于
      * 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
        drm/nouveau/pm: fix build with HWMON off
        gma500: silence gcc warnings in mid_get_vbt_data()
        drm/ttm: fix condition (and vs or)
        drm/radeon: double lock typo in radeon_vm_bo_rmv()
        drm/radeon: use after free in radeon_vm_bo_add()
        drm/sis|via: don't return stack garbage from free_mem ioctl
        drm/radeon/kms: remove pointless CS flags priority struct
        drm/radeon/kms: check if vm is supported in VA ioctl
        drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
        radeon: Fix disabling PCI bus mastering on big endian hosts.
        ttm: fix agp since ttm tt rework
        agp: Fix multi-line warning message whitespace
        drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
        drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
        drm/radeon/kms: sync across multiple rings when doing bo moves v3
        drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
        drm/radeon: GPU virtual memory support v22
        drm: make DRM_UNLOCKED ioctls with their own mutex
        drm: no need to hold global mutex for static data
        drm/radeon/benchmark: common modes sweep ignores 640x480@32
        ...
      
      Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c
      1a464cbb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · dbe950f2
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
        Input: tc3589x-keypad - add missing kerneldoc
        Input: ucb1400-ts - switch to using dev_xxx() for diagnostic messages
        Input: ucb1400_ts - convert to threaded IRQ
        Input: ucb1400_ts - drop inline annotations
        Input: usb1400_ts - add __devinit/__devexit section annotations
        Input: ucb1400_ts - set driver owner
        Input: ucb1400_ts - convert to use dev_pm_ops
        Input: psmouse - make sure we do not use stale methods
        Input: evdev - do not block waiting for an event if fd is nonblock
        Input: evdev - if no events and non-block, return EAGAIN not 0
        Input: evdev - only allow reading events if a full packet is present
        Input: add driver for pixcir i2c touchscreens
        Input: samsung-keypad - implement runtime power management support
        Input: tegra-kbc - report wakeup key for some platforms
        Input: tegra-kbc - add device tree bindings
        Input: add driver for AUO In-Cell touchscreens using pixcir ICs
        Input: mpu3050 - configure the sampling method
        Input: mpu3050 - ensure we enable interrupts
        Input: mpu3050 - add of_match table for device-tree probing
        Input: sentelic - document the latest hardware
        ...
      
      Fix up fairly trivial conflicts (device tree matching conflicting with
      some independent cleanups) in drivers/input/keyboard/samsung-keypad.c
      dbe950f2
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f62f6191
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (68 commits)
        hid-input/battery: add FEATURE quirk
        hid-input/battery: remove battery_val
        hid-input/battery: power-supply type really *is* a battery
        hid-input/battery: make the battery setup common for INPUTs and FEATUREs
        hid-input/battery: deal with both FEATURE and INPUT report batteries
        hid-input/battery: add quirks for battery
        hid-input/battery: remove apparently redundant kmalloc
        hid-input: add support for HID devices reporting Battery Strength
        HID: hid-multitouch: add support 9 new Xiroku devices
        HID: multitouch: add support for 3M 32"
        HID: multitouch: add support of Atmel multitouch panels
        HID: usbhid: defer LED setting to a workqueue
        HID: usbhid: hid-core: submit queued urbs before suspend
        HID: usbhid: remove LED_ON
        HID: emsff: use symbolic name instead of hardcoded PID constant
        HID: Enable HID_QUIRK_MULTI_INPUT for Trio Linker Plus II
        HID: Kconfig: fix syntax
        HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLY
        HID: multitouch: support PixArt optical touch screen
        HID: make parser more verbose about parsing errors by default
        ...
      
      Fix up rename/delete conflict in drivers/hid/hid-hyperv.c (removed in
      staging, moved in this branch) and similarly for the rules for same file
      in drivers/staging/hv/{Kconfig,Makefile}.
      f62f6191
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · d04baa15
      Linus Torvalds 提交于
      SCSI updates for post 3.2 merge window
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (67 commits)
        [SCSI] lpfc 8.3.28: Update driver version to 8.3.28
        [SCSI] lpfc 8.3.28: Add Loopback support for SLI4 adapters
        [SCSI] lpfc 8.3.28: Critical Miscellaneous fixes
        [SCSI] Lpfc 8.3.28: FC and SCSI Discovery Fixes
        [SCSI] lpfc 8.3.28: Add support for ABTS failure handling
        [SCSI] lpfc 8.3.28: SLI fixes and added SLI4 support
        [SCSI] lpfc 8.3.28: Miscellaneous fixes in sysfs and mgmt interfaces
        [SCSI] mpt2sas: Removed redundant calling of _scsih_probe_devices() from _scsih_probe
        [SCSI] mac_scsi: Remove obsolete IRQ_FLG_* users
        [SCSI] qla4xxx: Update driver version to 5.02.00-k10
        [SCSI] qla4xxx: check for FW alive before calling chip_reset
        [SCSI] qla4xxx: Fix qla4xxx_dump_buffer to dump buffer correctly
        [SCSI] qla4xxx: Fix the IDC locking mechanism
        [SCSI] qla4xxx: Wait for disable_acb before doing set_acb
        [SCSI] qla4xxx: Don't recover adapter if device state is FAILED
        [SCSI] qla4xxx: fix call trace on rmmod with ql4xdontresethba=1
        [SCSI] qla4xxx: Fix CPU lockups when ql4xdontresethba set
        [SCSI] qla4xxx: Perform context resets in case of context failures.
        [SCSI] iscsi class: export pid of process that created
        [SCSI] mpt2sas: Remove unused duplicate diag_buffer_enable param
        ...
      d04baa15
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 88266917
      Linus Torvalds 提交于
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: omap_wdt.c: fix the WDIOC_GETBOOTSTATUS ioctl if not implemented.
        watchdog: new driver for VIA chipsets
        watchdog: ath79_wdt: flush register writes
        drivers/watchdog/lantiq_wdt.c: drop iounmap for devm_ allocated data
        watchdog: documentation: describe nowayout in coversion-guide
        watchdog: documentation: update index file
        watchdog: Convert wm831x driver to devm_kzalloc()
        watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
        watchdog: convert drivers/watchdog/* to use module_platform_driver()
        watchdog: Use DEFINE_SPINLOCK() for static spinlocks
        watchdog: Convert Wolfson drivers to module_platform_driver
      88266917
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 269d4301
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (40 commits)
        regulator: set constraints.apply_uV to 0 in of_get_fixed_voltage_config
        regulator: max8925: fix enabled/disabled judgement mistake
        regulator: add regulator_bulk_force_disable function
        regulator: pass regulator_register of_node in fixed voltage driver
        regulator: add regulator_force_disable() definition for !CONFIG_REGULATOR
        regulator: Enable supply regulator if child rail is enabled.
        regulator: mc13892: Convert to devm_kzalloc()
        regulator: mc13783: Convert to devm_kzalloc()
        regulator: Fix checking return value of create_regulator
        regulator: Fix the error handling if create_regulator fails
        regulator: Export regulator_is_supported_voltage()
        regulator: mc13892: add device tree probe support
        regulator: mc13892: remove the unnecessary prefix from regulator name
        regulator: Convert wm831x regulator drivers to devm_kzalloc()
        regulator: da9052: Staticize non-exported symbols
        regulator: Replace kzalloc with devm_kzalloc and if-else with a switch-case for da9052-regulator
        regulator: Update da9052-regulator for DT changes
        regulator: DA9052/53 Regulator support
        regulator: pass device_node to of_get_regulator_init_data()
        regulator: If a single voltage is set with device tree then set apply_uV
        ...
      269d4301
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · d52739c6
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (31 commits)
        pinctrl: remove unnecessary max pin number
        pinctrl: correct a offset while enumerating pins
        pinctrl: some typo fixes
        pinctrl: rename U300 and SIRF pin controllers
        pinctrl: pass name instead of device to pin_config_*
        pinctrl: add "struct seq_file;" to pinconf.h
        pinctrl: conjure names for unnamed pins
        pinctrl: add a group-specific hog macro
        pinctrl: don't create a device for each pin controller
        arm/u300: don't use PINMUX_MAP_PRIMARY*
        pinctrl: implement PINMUX_MAP_SYS_HOG
        pinctrl: add a pin config interface
        pinctrl/coh901: driver to request its pins
        pinctrl: u300-pinmux: register proper GPIO ranges
        pinctrl: move the U300 GPIO driver to pinctrl
        ARM: u300: localize GPIO assignments
        pinctrl: make it possible to add multiple maps
        pinctrl: make a copy of pinmux map
        pinctrl: GPIO direction support for muxing
        pinctrl: print pin range in GPIO range debugs
        ...
      d52739c6
    • L
      Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev · abce00f9
      Linus Torvalds 提交于
      * 'upstream-linus' of git://github.com/jgarzik/libata-dev:
        ahci: support the STA2X11 I/O Hub
        pata_bf54x: fix BMIDE status register emulation
        ata: add ata port hibernate callbacks
        ata: update ata port's runtime status during system resume
        [SCSI] runtime resume parent for child's system-resume
        ahci: platform support for suspend/resume
        libata-core: kill duplicate statement in ata_do_set_mode()
        pata_of_platform: remove direct dependency on OF_IRQ
        SATA/PATA: convert drivers/ata/* to use module_platform_driver()
        pata_cs5536: forward port changes from cs5536
        libata-sff: use ATAPI_{COD|IO}
        ata: add ata port runtime PM callbacks
        ata: add ata port system PM callbacks
        [SCSI] sd: check runtime PM status in sd_shutdown
        [SCSI] check runtime PM status in system PM
        [SCSI] add flag to skip the runtime PM calls on the host
        ata: make ata port as parent device of scsi host
        ahci: start engine only during soft/hard resets
      abce00f9
    • L
      Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen · 90160371
      Linus Torvalds 提交于
      * 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (37 commits)
        xen/pciback: Expand the warning message to include domain id.
        xen/pciback: Fix "device has been assigned to X domain!" warning
        xen/pciback: Move the PCI_DEV_FLAGS_ASSIGNED ops to the "[un|]bind"
        xen/xenbus: don't reimplement kvasprintf via a fixed size buffer
        xenbus: maximum buffer size is XENSTORE_PAYLOAD_MAX
        xen/xenbus: Reject replies with payload > XENSTORE_PAYLOAD_MAX.
        Xen: consolidate and simplify struct xenbus_driver instantiation
        xen-gntalloc: introduce missing kfree
        xen/xenbus: Fix compile error - missing header for xen_initial_domain()
        xen/netback: Enable netback on HVM guests
        xen/grant-table: Support mappings required by blkback
        xenbus: Use grant-table wrapper functions
        xenbus: Support HVM backends
        xen/xenbus-frontend: Fix compile error with randconfig
        xen/xenbus-frontend: Make error message more clear
        xen/privcmd: Remove unused support for arch specific privcmp mmap
        xen: Add xenbus_backend device
        xen: Add xenbus device driver
        xen: Add privcmd device driver
        xen/gntalloc: fix reference counts on multi-page mappings
        ...
      90160371
    • L
      Merge branch 'stable/for-linus-fixes-3.3' of... · ae5cfc05
      Linus Torvalds 提交于
      Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
      ae5cfc05
    • L
      Merge branch 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 3dcf6c1b
      Linus Torvalds 提交于
      * 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (74 commits)
        KVM: PPC: Whitespace fix for kvm.h
        KVM: Fix whitespace in kvm_para.h
        KVM: PPC: annotate kvm_rma_init as __init
        KVM: x86 emulator: implement RDPMC (0F 33)
        KVM: x86 emulator: fix RDPMC privilege check
        KVM: Expose the architectural performance monitoring CPUID leaf
        KVM: VMX: Intercept RDPMC
        KVM: SVM: Intercept RDPMC
        KVM: Add generic RDPMC support
        KVM: Expose a version 2 architectural PMU to a guests
        KVM: Expose kvm_lapic_local_deliver()
        KVM: x86 emulator: Use opcode::execute for Group 9 instruction
        KVM: x86 emulator: Use opcode::execute for Group 4/5 instructions
        KVM: x86 emulator: Use opcode::execute for Group 1A instruction
        KVM: ensure that debugfs entries have been created
        KVM: drop bsp_vcpu pointer from kvm struct
        KVM: x86: Consolidate PIT legacy test
        KVM: x86: Do not rely on implicit inclusions
        KVM: Make KVM_INTEL depend on CPU_SUP_INTEL
        KVM: Use memdup_user instead of kmalloc/copy_from_user
        ...
      3dcf6c1b
  8. 10 1月, 2012 10 次提交
反馈
建议
客服 返回
顶部