diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 22:32:01 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-28 22:32:01 +0300 |
commit | a1842b2b6fc011145c24180744d62d88b895f8e3 (patch) | |
tree | 5232407e751e0e5209fcb0f62b8032d1bbe75d00 /arch/m68k | |
parent | 0723ab4a97a19bf9da135d68529977aeba17570d (diff) | |
parent | 8d057e3a180da16b0d1519056295165e7b8dc8f5 (diff) | |
download | linux-a1842b2b6fc011145c24180744d62d88b895f8e3.tar.xz |
Merge tag 'chrome-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
Pull chrome platform updates from Olof Johansson
"A handful of Chrome driver and binding changes this merge window:
- a few patches to fix probing and configuration of pstore
- a few patches adding Elan touchpad registration on a few devices
- EC changes: a security fix dealing with max message sizes and
addition of compat_ioctl support.
- keyboard backlight control support
There was also an accidential duplicate registration of trackpads on
'Leon', which was reverted just recently"
* tag 'chrome-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
Revert "platform/chrome: chromeos_laptop: Add Leon Touch"
platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf
platform/chrome: chromeos_laptop - Add elan trackpad option for C720
platform/chrome: cros_ec_dev - Populate compat_ioctl
platform/chrome: cros_ec_lightbar - use name instead of ID to hide lightbar attributes
platform/chrome: cros_ec_dev - Fix security issue
platform/chrome: Add Chrome OS keyboard backlight LEDs support
platform/chrome: use to_platform_device()
platform/chrome: pstore: Move to larger record size.
platform/chrome: pstore: probe for ramoops buffer using acpi
platform/chrome: chromeos_laptop: Add Leon Touch
Diffstat (limited to 'arch/m68k')
0 files changed, 0 insertions, 0 deletions