tree 1cef9c9ad7f7d0dcd26b5ab7072e3289e02ec50b
parent ccae663cd4f62890d862c660e5ed762eb9821c14
parent 9f89748463f13c9657496b12820f09a988ce77ff
author Linus Torvalds <torvalds@linux-foundation.org> 1357837781 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1357837781 -0800

Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver bugfixes from Matthew Garrett.

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
  asus-laptop: Fix potential invalid pointer dereference
  Update MAINTAINERS entry
  asus-laptop: Do not call HWRS on init
  sony-laptop: fix SNC buffer calls when SN06 returns Integers
  samsung-laptop: Add quirk for broken acpi_video backlight on N250P
  acer-wmi: add Aspire 5741G touchpad toggle key
  acer-wmi: change to emit touchpad on off key
  acer-wmi: fix obj is NULL but dereferenced
  MAINTAINERS: change the mail address of acer-wmi/msi-laptop maintainer