diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-15 18:24:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-15 18:24:23 +0100 |
| commit | b0c9d043d4ae95d898aa79b2d89226262de471fd (patch) | |
| tree | 688eb6a964313b6cc3992f0d3059d959ef0ead91 /arch/arm/mach-omap2/board-generic.c | |
| parent | Input: tsc2004/5 - switch to using generic device properties (diff) | |
| parent | input: cros_ec_keyb: Add Tablet Mode switch (diff) | |
| download | linux-b0c9d043d4ae95d898aa79b2d89226262de471fd.tar.xz linux-b0c9d043d4ae95d898aa79b2d89226262de471fd.zip | |
Merge tag 'ib-mfd-input-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next
Merge in cros-ec changes applied through MFD branch to resolve
conflicts.
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
0 files changed, 0 insertions, 0 deletions