1. 31 Dec, 2009 3 commits
    • Linus Torvalds's avatar
      Merge branch 'tracing-fixes-for-linus' of... · b21c0704
      Linus Torvalds authored
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        tracing: Fix sign fields in ftrace_define_fields_##call()
        tracing/syscalls: Fix typo in SYSCALL_DEFINE0
        tracing/kprobe: Show sign of fields in trace_kprobe format files
        ksym_tracer: Remove trace_stat
        ksym_tracer: Fix race when incrementing count
        ksym_tracer: Fix to allow writing newline to ksym_trace_filter
        ksym_tracer: Fix to make the tracer work
        tracing: Kconfig spelling fixes and cleanups
        tracing: Fix setting tracer specific options
        Documentation: Update ftrace-design.txt
        Documentation: Update tracepoint-analysis.txt
        Documentation: Update mmiotrace.txt
      b21c0704
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4e58fb73
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: iforce - wait for command completion when closing the device
        Input: twl4030-pwrbutton - switch to using threaded IRQ
        Input: twl4030_keypad - switch to using threaded IRQ
        Input: lifebook - add CONFIG_DMI dependency
        Input: wistron - fix test for CONFIG_PM
        Input: psmouse - fix compile warning in hgpk module
        Input: matrix-keypad - handle cases when GPIOs can't be wakeup sources
        Input: iforce - fix oops on device disconnect
        Input: ff-memless - add notion of direction to for rumble effects
        Input: ff-memless - another fix for signed to unsigned overflow
        Input: ff-memless - start playing FF effects immediately
        Input: serio - do not mark kseriod freezable anymore
        Input: speed up suspend/shutdown for PS/2 mice and keyboards
      4e58fb73
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 08d869aa
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        ACPI: introduce kernel parameter acpi_sleep=sci_force_enable
        ACPI: WMI: Survive BIOS with duplicate GUIDs
        dell-wmi - fix condition to abort driver loading
        wmi: check find_guid() return value to prevent oops
        dell-wmi, hp-wmi, msi-wmi: check wmi_get_event_data() return value
        ACPI: hp-wmi, msi-wmi: clarify that wmi_install_notify_handler() returns an acpi_status
        dell-wmi: sys_init_module: 'dell_wmi'->init suspiciously returned 21, it should
        ACPI video: correct error-handling code
        ACPI video: no warning message if "acpi_backlight=vendor" is used
        ACPI: fix ACPI=n allmodconfig build
        thinkpad-acpi: improve Kconfig help text
        thinkpad-acpi: update volume subdriver documentation
        thinkpad-acpi: make volume subdriver optional
        thinkpad-acpi: don't fail to load the entire module due to ALSA problems
        thinkpad-acpi: don't take the first ALSA slot by default
      08d869aa
  2. 30 Dec, 2009 37 commits