Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

AndroidKernelMSM
- Activity
- Members

Snippets Groups Projects

Matombo
AndroidKernelMSM
Commits
7122f814

Commit 7122f814 authored Jun 8, 2017 by Steve Pfetsch

Downloads
- Plain Diff

Merge branch 'android-msm-marlin-3.18-nyc-mr2' into android-msm-marlin-3.18

August 2017.1

 Conflicts:
	fs/f2fs/super.c

Bug: 62368772
Change-Id: I3c8b4c0a7ab850c4fa4215034cdff18d8f62f621

parents 8ad5b245 26a2aa5d

Branches

Tags

No related merge requests found

Changes 57

Expand all Show whitespace changes

Inline Side-by-side

Showing

arch/arm64/configs/msm-auto_defconfig 0 additions, 1 deletion

arch/arm64/configs/msm-auto_defconfig
arch/arm64/configs/msm_defconfig 0 additions, 1 deletion

arch/arm64/configs/msm_defconfig
drivers/Kconfig 0 additions, 2 deletions

drivers/Kconfig
drivers/Makefile 0 additions, 3 deletions

drivers/Makefile
drivers/crypto/msm/qcedev.c 12 additions, 0 deletions

drivers/crypto/msm/qcedev.c
drivers/gpu/msm/kgsl.c 1 addition, 1 deletion

drivers/gpu/msm/kgsl.c
drivers/gud/Kconfig 0 additions, 35 deletions

drivers/gud/Kconfig
drivers/gud/Makefile 0 additions, 6 deletions

drivers/gud/Makefile
drivers/gud/MobiCoreDriver/Makefile 0 additions, 33 deletions

drivers/gud/MobiCoreDriver/Makefile
drivers/gud/MobiCoreDriver/admin.c 0 additions, 1011 deletions

drivers/gud/MobiCoreDriver/admin.c
drivers/gud/MobiCoreDriver/admin.h 0 additions, 32 deletions

drivers/gud/MobiCoreDriver/admin.h
drivers/gud/MobiCoreDriver/api.c 0 additions, 419 deletions

drivers/gud/MobiCoreDriver/api.c
drivers/gud/MobiCoreDriver/api.h 0 additions, 46 deletions

drivers/gud/MobiCoreDriver/api.h
drivers/gud/MobiCoreDriver/arm.h 0 additions, 88 deletions

drivers/gud/MobiCoreDriver/arm.h
drivers/gud/MobiCoreDriver/build_tag.h 0 additions, 15 deletions

drivers/gud/MobiCoreDriver/build_tag.h
drivers/gud/MobiCoreDriver/client.c 0 additions, 572 deletions

drivers/gud/MobiCoreDriver/client.c
drivers/gud/MobiCoreDriver/client.h 0 additions, 99 deletions

drivers/gud/MobiCoreDriver/client.h
drivers/gud/MobiCoreDriver/clientlib.c 0 additions, 433 deletions

drivers/gud/MobiCoreDriver/clientlib.c
drivers/gud/MobiCoreDriver/clock.c 0 additions, 161 deletions

drivers/gud/MobiCoreDriver/clock.c
drivers/gud/MobiCoreDriver/clock.h 0 additions, 53 deletions

drivers/gud/MobiCoreDriver/clock.h

with 13 additions and 3011 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment