diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2017-05-24 19:39:00 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2017-05-24 19:39:00 +0800 |
| commit | c590abd05542097f8d54654386098987197c18f8 (patch) | |
| tree | cdec33bb735df7eb3f1b470b098a00edffc21d12 /kernel/ptrace.c | |
| parent | c69f8a499d1b8681d9e16c4f5797b8a10aa525d3 (diff) | |
| parent | b55426ff40870f5c8a31b9b3f6f95a80273ef73d (diff) | |
Merge branch 'working-hikey-tracking-config-v4.4' into working-hikey-mainline-rebase-v4.4-c2017-05-24-19-38-44
* working-hikey-tracking-config-v4.4: (25 commits)
arm64: configs: hikey: support LCD and touch
defconfig: Enable suspend support
defconfig: enable BT_LEDS
arm64: config: enable power efficiency workqueue
defconfig: Add gpu configures
arm64: defconfig: fix: i2c built as 'y'
arm64: defcofnig: Set cma heap size to 128MB
arm64: defconfig: Enable panel driver
arm64: defconfig: Enable adv7511 driver
arm64: defconfig: Enable HiSilicon kirin drm driver
arm64: defconfig: Enable TEE and OPTEE
ARM64: defconfig: support thermal for Hikey
ARM64: defconfig: enable CPUFreq driver for Hikey
arm64: defconfig: Enable K3_DMA to support HDMI audio
arm64: defconfig: enable Hi6210 I2S driver, SND and SND debug
hikey: config: enable CONFIG_HISI_POWERKEY
hikey: config: enable CONFIG_PSTORE CONFIG_PSTORE_RAM built as modules
hikey: config: disable ANDROID_PARANOID_NETWORK
hikey: config: enable Bluetooth
hikey: config: enable HI6220 MTCMOS regulators
...
Diffstat (limited to 'kernel/ptrace.c')
0 files changed, 0 insertions, 0 deletions