summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 03:29:34 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-24 03:29:34 +0200
commit9c5ea3675dbe4853eea747542da257c3e6f18de2 (patch)
tree575a9498cc4156c4c938e2a39b5c4b3f5a46936f /net
parentMerge branch 'for-upstream/pvhvm' of git://xenbits.xensource.com/people/ianc/... (diff)
parenthp-wmi: Fix query interface (diff)
downloadlinux-9c5ea3675dbe4853eea747542da257c3e6f18de2.tar.xz
linux-9c5ea3675dbe4853eea747542da257c3e6f18de2.zip
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