git merge --no-ff VerifyA2Panel_from_VerifyBluetooth

nelsonchung@gps1004:~/myandroid9.1/kernel_imx$ git merge --no-ff VerifyA2Panel_from_VerifyBluetooth
Auto-merging arch/arm/mach-mx5/mx51_babbage.c
Merge made by recursive.
Auto packing the repository for optimum performance. You may also
run "git gc" manually. See "git help gc" for more information.
Counting objects: 10580, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (10363/10363), done.
Writing objects: 100% (10580/10580), done.
Total 10580 (delta 7774), reused 0 (delta 0)
 arch/arm/mach-mx5/mx51_babbage.c    |   58 +++++++++-------
 drivers/input/keyboard/Makefile     |    2 +
 drivers/input/keyboard/rtk_vkeyb.c  |  129 +++++++++++++++++++++++++++++++++++
 drivers/mxc/ipu3/Makefile           |    2 +
 drivers/mxc/ipu3/ipu_device.c       |    2 +
 drivers/mxc/ipu3/ipu_disp.c         |    8 +-
 drivers/mxc/pmic/mc13892/pmic_adc.c |   96 +++++++++++++-------------
 drivers/video/mxc/Makefile          |    2 +
 drivers/video/mxc/ldb.c             |   12 ++--
 drivers/video/mxc/mxc_epdc_fb.c     |    1 +
 drivers/video/mxc/mxc_ipuv3_fb.c    |    6 +-
 drivers/video/mxc/mxcfb_epson.c     |    2 +
 12 files changed, 236 insertions(+), 84 deletions(-)
 create mode 100644 drivers/input/keyboard/rtk_vkeyb.c