diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-10 11:13:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-10 11:13:58 -0700 |
commit | 58d08e3b2c2033354b91467da33deffa06360c28 (patch) | |
tree | 7d0660f627e55038181d6427f26adbec1fb00dba /fs/proc/proc_net.c | |
parent | 64e3bbc7ef7029669c7fb23408864c60f147f7b9 (diff) | |
parent | 5502486a2077e4280c618b82e8a77ed35932956f (diff) | |
download | linux-58d08e3b2c2033354b91467da33deffa06360c28.tar.gz |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform
Pull chrome platform updates from Olof Johansson: "Updates to the Chromebook/box platform drivers: - a bugfix to pstore registration that makes it also work on non-Google systems - addition of new shipped Chromebooks (later models have more probing through ACPI so the need for these updates will be less over time). - A couple of minor coding style updates" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform: platform/chrome: chromeos_laptop - Add a limit for deferred retries platform/chrome: Add support for the acer c720p touchscreen. platform/chrome: pstore: fix dmi table to match all chrome systems platform/chrome: coding style fixes platform/chrome: chromeos_laptop - Add Toshiba CB35 Touch platform/chrome: chromeos_laptop - Add Dell Chromebook 11 touch platform/chrome: chromeos_laptop - Add HP Chromebook 14 platform/chrome: chromeos_laptop - Add support for Acer C720
Diffstat (limited to 'fs/proc/proc_net.c')
0 files changed, 0 insertions, 0 deletions