Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 01:29:34 +0000 (18:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 01:29:34 +0000 (18:29 -0700)
commit9c5ea3675dbe4853eea747542da257c3e6f18de2
tree575a9498cc4156c4c938e2a39b5c4b3f5a46936f
parentc05e1e23b8e5cf6c3a499e4aeb8503dcb3924394
parenta8ec105c0764c848d59f18a31f91fa00c99b2e7f
Merge branch 'for_linus' of git://git./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 query interface
  ACPI_TOSHIBA needs LEDS support