]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jul 2011 19:47:09 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jul 2011 19:47:09 +0000 (12:47 -0700)
commit145628130b9b364fe246e96ba52386d97af40d64
tree383727a336c9165474c37c98d8cdb038123e0c64
parent83e95697143d341f3c670c4c5cda0268ae198e63
parent0401846c339fbdfb9bd822d83b43e8a9f7d072a4
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:
  hp-wmi: fix use after free
  dell-laptop - using buffer without mutex_lock
  Revert: "dell-laptop: Toggle the unsupported hardware killswitch"
  platform-drivers-x86: set backlight type to BACKLIGHT_PLATFORM
  thinkpad-acpi: handle HKEY 0x4010, 0x4011 events
  drivers/platform/x86: Fix memory leak
  thinkpad-acpi: handle some new HKEY 0x60xx events
  acer-wmi: fix bitwise bug when set device state
  acer-wmi: Only update rfkill status for associated hotkey events