1. 11 Jan, 2011 37 commits
  2. 10 Jan, 2011 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · 443e6221
      Linus Torvalds authored
      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: (36 commits)
        sony-laptop: support new hotkeys on the P, Z and EC series
        platform/x86: Consistently select LEDS Kconfig options
        sony-laptop: fix sparse non-ANSI function warning
        intel_ips: fix sparse non-ANSI function warning
        Support KHLB2 in the compal laptop driver
        acer-wmi: Enabled Acer Launch Manager mode
        [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
        ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
        acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
        acer-wmi: Detect the WiFi/Bluetooth/3G devices available
        acer-wmi: Add 3G rfkill sysfs file
        acer-wmi: Add acer wmi hotkey events support
        platform/x86: Kconfig: Replace select by depends on ACPI_WMI
        ideapad: pass ideapad_priv as argument (part 2)
        ideapad: pass ideapad_priv as argument (part 1)
        ideapad: add markups, unify comments and return result when init
        ideapad: add hotkey support
        ideapad: let camera power control entry under platform driver
        ideapad: add platform driver for ideapad
        fujitsu-laptop: fix compiler warning on pnp_ids
        ...
      443e6221
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 0caca697
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68knommu: Need to check __get_user()/__put_user() result
        m68knommu: signal.c __user annotations
        m68knommu: Equivalent of "m68k: handle new gcc's"
        m68knommu: f_pcr has been gone since headers' merge
        m68knommu: Don't lose state if sigframe setup fails
        m68knommu: Handle multiple pending signals
        m68knommu: Switch to saner sigsuspend
        m68knommu: Don't bother with SA_ONESHOT
        m68k: Check __get_user()/__put_user() return value
        m68k: Missing syscall_trace() on sigreturn
        m68k: Fix stack mangling logics in sigreturn
        m68k: If we fail to set sigframe up, just leave regs alone...
        m68k: Don't lose state if sigframe setup fails
        m68k: Simplify the singlestepping handling in signals
        m68k: Switch to saner sigsuspend()
        m68k: Resetting sa_handler in local copy of k_sigaction is pointless
        m68k/sun3: Kill pte_unmap() warnings
      0caca697
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · ecacc6c7
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Avoid array overflow if there are too many cpus in SRAT table
        [IA64] Remove unlikely from cpu_is_offline
        [IA64] irq_ia64, use set_irq_chip
        [IA64] perfmon: Change vmalloc to vzalloc and drop memset.
        [IA64] eliminate race condition in smp_flush_tlb_mm
      ecacc6c7