diff options
author | Darren Hart <dvhart@linux.intel.com> | 2014-12-10 20:49:57 -0800 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2014-12-10 20:53:08 -0800 |
commit | cc888de2c3939e6bdeca35b85d0d60302ee64c4f (patch) | |
tree | 2cd64845669f70d446b04616112811854a345145 /drivers/misc/isl29003.c | |
parent | f587f07fef33319a32dde533a23bb3974d30bf5a (diff) | |
parent | a707c27cee56bfb234be6d3acbcc7928760f99be (diff) | |
download | linux-cc888de2c3939e6bdeca35b85d0d60302ee64c4f.tar.bz2 |
Merge branch 'thinkpad-acpi' into for-next
thinkpad-acpi:
acpi: Remove _OSI(Linux) for ThinkPads
thinkpad-acpi: Try to use full software mute control
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/misc/isl29003.c')
0 files changed, 0 insertions, 0 deletions