diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-05 21:14:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-05 21:14:04 -0400 |
| commit | 3ce05a4e740539a3e9d48456e2b046b7240df3ff (patch) | |
| tree | 95c860d85282bd32e94b74c374edc9fa025eb8a9 /include/linux/timerqueue.h | |
| parent | d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8 (diff) | |
| parent | df6dd1b35b0ec0ac6a5298378ceaf487091f448c (diff) | |
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
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions