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)
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>

Trivial merge