1. 05 8月, 2010 8 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 · f46e9913
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
        PM / Runtime: Add runtime PM statistics (v3)
        PM / Runtime: Make runtime_status attribute not debug-only (v. 2)
        PM: Do not use dynamically allocated objects in pm_wakeup_event()
        PM / Suspend: Fix ordering of calls in suspend error paths
        PM / Hibernate: Fix snapshot error code path
        PM / Hibernate: Fix hibernation_platform_enter()
        pm_qos: Get rid of the allocation in pm_qos_add_request()
        pm_qos: Reimplement using plists
        plist: Add plist_last
        PM: Make it possible to avoid races between wakeup and system sleep
        PNPACPI: Add support for remote wakeup
        PM: describe kernel policy regarding wakeup defaults (v. 2)
        PM / Hibernate: Fix typos in comments in kernel/power/swap.c
      f46e9913
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 8d91530c
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Remove pointless printk from p4-clockmod.
        [CPUFREQ] Fix section mismatch for powernow_cpu_init in powernow-k7.c
        [CPUFREQ] Fix section mismatch for longhaul_cpu_init.
        [CPUFREQ] Fix section mismatch for longrun_cpu_init.
        [CPUFREQ] powernow-k8: Fix misleading variable naming
        [CPUFREQ] Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
        [CPUFREQ] arch/x86/kernel/cpu/cpufreq: use for_each_pci_dev()
        [CPUFREQ] fix brace coding style issue.
        [CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent
        [CPUFREQ] acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification
        [CPUFREQ] ondemand: don't synchronize sample rate unless multiple cpus present
        [CPUFREQ] unexport (un)lock_policy_rwsem* functions
        [CPUFREQ] ondemand: Refactor frequency increase code
        [CPUFREQ] powernow-k8: On load failure, remind the user to enable support in BIOS setup
        [CPUFREQ] powernow-k8: Limit Pstate transition latency check
        [CPUFREQ] Fix PCC driver error path
        [CPUFREQ] fix double freeing in error path of pcc-cpufreq
        [CPUFREQ] pcc driver should check for pcch method before calling _OSC
        [CPUFREQ] fix memory leak in cpufreq_add_dev
        [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)"
      
      Manually fix up non-data merge conflict introduced by new calling
      conventions for trace_power_start() in commit 6f4f2723 ("x86
      cpufreq: Make trace_power_frequency cpufreq driver independent"), which
      didn't update the intel_idle native hardware cpuidle driver.
      8d91530c
    • L
      Merge branch 'for_linus' of... · c145307a
      Linus Torvalds 提交于
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (88 commits)
        ips driver: make it less chatty
        intel_scu_ipc: fix size field for intel_scu_ipc_command
        intel_scu_ipc: return -EIO for error condition in busy_loop
        intel_scu_ipc: fix data packing of PMIC command on Moorestown
        Clean up command packing on MRST.
        zero the stack buffer before giving random garbage to the SCU
        Fix stack buffer size for IPC writev messages
        intel_scu_ipc: Use the new cpu identification function
        intel_scu_ipc: tidy up unused bits
        Remove indirect read write api support.
        intel_scu_ipc: Support Medfield processors
        intel_scu_ipc: detect CPU type automatically
        x86 plat: limit x86 platform driver menu to X86
        acpi ec_sys: Be more cautious about ec write access
        acpi ec: Fix possible double io port registration
        hp-wmi: acpi_drivers.h is already included through acpi.h two lines below
        hp-wmi: Fix mixing up of and/or directive
        dell-laptop: make dell_laptop_i8042_filter() static
        asus-laptop: fix asus_input_init error path
        msi-wmi: make needlessly global symbols static
        ...
      c145307a
    • L
      Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 5e83f6fb
      Linus Torvalds 提交于
      * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (198 commits)
        KVM: VMX: Fix host GDT.LIMIT corruption
        KVM: MMU: using __xchg_spte more smarter
        KVM: MMU: cleanup spte set and accssed/dirty tracking
        KVM: MMU: don't atomicly set spte if it's not present
        KVM: MMU: fix page dirty tracking lost while sync page
        KVM: MMU: fix broken page accessed tracking with ept enabled
        KVM: MMU: add missing reserved bits check in speculative path
        KVM: MMU: fix mmu notifier invalidate handler for huge spte
        KVM: x86 emulator: fix xchg instruction emulation
        KVM: x86: Call mask notifiers from pic
        KVM: x86: never re-execute instruction with enabled tdp
        KVM: Document KVM_GET_SUPPORTED_CPUID2 ioctl
        KVM: x86: emulator: inc/dec can have lock prefix
        KVM: MMU: Eliminate redundant temporaries in FNAME(fetch)
        KVM: MMU: Validate all gptes during fetch, not just those used for new pages
        KVM: MMU: Simplify spte fetch() function
        KVM: MMU: Add gpte_valid() helper
        KVM: MMU: Add validate_direct_spte() helper
        KVM: MMU: Add drop_large_spte() helper
        KVM: MMU: Use __set_spte to link shadow pages
        ...
      5e83f6fb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · fe445c6e
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
        Input: adp5588-keypad - fix NULL dereference in adp5588_gpio_add()
        Input: cy8ctmg110 - capacitive touchscreen support
        Input: keyboard - also match braille-only keyboards
        Input: adp5588-keys - export unused GPIO pins
        Input: xpad - add product ID for Hori Fighting Stick EX2
        Input: adxl34x - fix leak and use after free
        Input: samsung-keypad - Add samsung keypad driver
        Input: i8042 - reset keyboard controller wehen resuming from S2R
        Input: synaptics - set min/max for finger width
        Input: synaptics - only report width on hardware that supports it
        Input: evdev - signal that device is writable in evdev_poll()
        Input: mousedev - signal that device is writable in mousedev_poll()
        Input: change input handlers to use bool when possible
        Input: document the MT event slot protocol
        Input: introduce MT event slots
        Input: usbtouchscreen - implement reset_resume
        Input: usbtouchscreen - implement runtime power management
        Input: usbtouchscreen - implement basic suspend/resume
        Input: Add ATMEL QT602240 touchscreen driver
        Input: fix signedness warning in input_set_keycode()
        ...
      fe445c6e
    • L
      Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · f63b759c
      Linus Torvalds 提交于
      * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
        V4L/DVB: sms: Convert IR support to use the Remote Controller core
        V4L/DVB: sms: properly initialize IR phys and IR name
        V4L/DVB: standardize names at rc-dib0700 tables
        V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
        V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
        V4L/DVB: dib0700: properly implement IR change_protocol
        V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
        V4L/DVB: dib0700: avoid bad repeat
        V4L/DVB: Port dib0700 to rc-core
        V4L/DVB: Add a keymap file with dib0700 table
        V4L/DVB: dvb-usb: add support for rc-core mode
        V4L/DVB: dvb-usb: prepare drivers for using rc-core
        V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
        V4L/DVB: rj54n1cb0c: fix a comment in the driver
        V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
        V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
        V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
        V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
        V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
        V4L/DVB: mediabus: fix ambiguous pixel code names
        ...
      f63b759c
    • L
      Merge branch 'stable/swiotlb-0.8.3' of... · 4a35cee0
      Linus Torvalds 提交于
      Merge branch 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6
      
      * 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
        swiotlb: Make swiotlb bookkeeping functions visible in the header file.
        swiotlb: search and replace "int dir" with "enum dma_data_direction dir"
        swiotlb: Make internal bookkeeping functions have 'swiotlb_tbl' prefix.
        swiotlb: add the swiotlb initialization function with iotlb memory
        swiotlb: add swiotlb_tbl_map_single library function
      4a35cee0
    • L
      Merge branch 'for-linus' of... · 7e688095
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (90 commits)
        AppArmor: fix build warnings for non-const use of get_task_cred
        selinux: convert the policy type_attr_map to flex_array
        AppArmor: Enable configuring and building of the AppArmor security module
        TOMOYO: Use pathname specified by policy rather than execve()
        AppArmor: update path_truncate method to latest version
        AppArmor: core policy routines
        AppArmor: policy routines for loading and unpacking policy
        AppArmor: mediation of non file objects
        AppArmor: LSM interface, and security module initialization
        AppArmor: Enable configuring and building of the AppArmor security module
        AppArmor: update Maintainer and Documentation
        AppArmor: functions for domain transitions
        AppArmor: file enforcement routines
        AppArmor: userspace interfaces
        AppArmor: dfa match engine
        AppArmor: contexts used in attaching policy to system objects
        AppArmor: basic auditing infrastructure.
        AppArmor: misc. base functions and defines
        TOMOYO: Update version to 2.3.0
        TOMOYO: Fix quota check.
        ...
      7e688095
  2. 04 8月, 2010 28 次提交
  3. 03 8月, 2010 4 次提交