Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 6f2d5fd6 authored by LCPD Auto Merger's avatar LCPD Auto Merger
Browse files

Merge branch 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-rt-linux-4.9.y


TI-Feature: ti_linux_base_rt
TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git
TI-Branch: ti-linux-4.9.y

* 'ti-linux-4.9.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel:
  Revert "HACK: UAPI: Fix VIDEO_MAX_FRAME/VB2_MAX_FRAME kbuild issue"
  Revert "Revert "HACK: input: touchscreen: edt-ft5x06: fix driver autoprobing""

Signed-off-by: default avatarLCPD Auto Merger <lcpd_integration@list.ti.com>
parents 4539b8ff 1f9ae8c9
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment