From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 May 2015 01:14:04 +0000 (-0700)
Subject: Merge tag 'platform-drivers-x86-v4.1-2' of git://git.infradead.org/users/dvhart/linux... 
X-Git-Tag: v4.1-rc3~27
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3ce05a4e740539a3e9d48456e2b046b7240df3ff;p=linux.git

Merge tag 'platform-drivers-x86-v4.1-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "This includes a trivial warning and adding a Lenovo laptop to an
  existing quirk.

  I've held off on things like the latter in the past, but I didn't feel
  it was risky enough to push out to 4.2.

   - thinkpad_acpi:
        Fix warning for static not at beginning

   - ideapad_laptop:
        Add Lenovo G40-30 to devices without radio switch"

* tag 'platform-drivers-x86-v4.1-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  thinkpad_acpi: Fix warning for static not at beginning
  ideapad_laptop: Add Lenovo G40-30 to devices without radio switch
---

3ce05a4e740539a3e9d48456e2b046b7240df3ff