summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-23 18:29:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-23 18:29:34 -0700
commit9c5ea3675dbe4853eea747542da257c3e6f18de2 (patch)
tree575a9498cc4156c4c938e2a39b5c4b3f5a46936f /net
parentc05e1e23b8e5cf6c3a499e4aeb8503dcb3924394 (diff)
parenta8ec105c0764c848d59f18a31f91fa00c99b2e7f (diff)
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 query interface ACPI_TOSHIBA needs LEDS support
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions