Merge branch 'thinkpad-acpi' into for-next
authorDarren Hart <dvhart@linux.intel.com>
Thu, 11 Dec 2014 04:49:57 +0000 (20:49 -0800)
committerDarren Hart <dvhart@linux.intel.com>
Thu, 11 Dec 2014 04:53:08 +0000 (20:53 -0800)
commitcc888de2c3939e6bdeca35b85d0d60302ee64c4f
tree2cd64845669f70d446b04616112811854a345145
parentf587f07fef33319a32dde533a23bb3974d30bf5a
parenta707c27cee56bfb234be6d3acbcc7928760f99be
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>