diff options
author | Olof Johansson <olof@lixom.net> | 2017-06-18 19:05:52 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-06-18 19:05:52 -0700 |
commit | f9928af64be853d0f92751fda69d17b3cace4d3c (patch) | |
tree | e6b96663ff6378f8e5e873071140bf1da93bc615 /net/lapb/lapb_timer.c | |
parent | 5ed02dbb497422bf225783f46e6eadd237d23d6b (diff) | |
parent | 0b997c8c9562dd61733dfeb9e1a5962730338e6e (diff) |
Merge tag 'davinci-for-v4.13/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Re-sync of davinci_all_defconfig with savedefconfig and enable
CPPI 4.1 DMA for MUSB, some commonly used USB devices, and
Lego Mindstorms EV3 battery driver.
* tag 'davinci-for-v4.13/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: Enable CPPI 4.1 USB OTG DMA
ARM: davinci_all_defconfig: enable USB audio/video device support
ARM: davinci_all_defconfig: cleanup with savedefconfig
ARM: davinci_all_defconfig: enable LEGO MINDSTORMS EV3 battery module
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions