diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2016-07-01 10:53:08 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2016-07-01 10:53:08 +0800 |
| commit | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d (patch) | |
| tree | 2d2c81ea09fd49c594e2c98c1f641b9a9453b8cb /drivers/usb/core/config.c | |
| parent | b990c3dbebbf6934585f87d67d7458fc2106fcb0 (diff) | |
| parent | ddf5088e502aad5f049a0c3c0112433ac4cc40a9 (diff) | |
Merge remote-tracking branch 'linaro-android/test/linaro-android-4.4' into working-hikey-mainline-rebase-v4.4-c28
* linaro-android/test/linaro-android-4.4: (471 commits)
android: skip building drivers as modules
usb: gadget: u_ether: use %z format specifier for size_t
goldfish_bus: switch GOLDFISH_BUS config back to bool
tcp: Fix IPV6 module build errors
userfaultfd: Add missing vma_merge parameter
goldfish: pipe: fix platform_no_drv_owner.cocci warnings
uid_cputime: skip power reporting per uid for now
cpufreq: interactive: build fixes for 4.4
cgroup: refactor allow_attach handler for 4.4
usb: gadget: rndis: fix broken build for 4.4
usb: gadget: rndis: fix broken data aggregation build
mm: private anonymous memory build fixes for 4.4
power: suspend_time: include module.h instead of init.h
misc seq_printf fixes for 4.4
netfilter: xt_qtaguid/socket: build fixes for 4.4
net: PPPoPNS and PPPoLAC build fixes for 4.4
usb: gadget: rndis: use %z format specifier for size_t
kbuild: Makefile.clean: make Kbuild and Makefile optional
ANDROID: rtc-palmas: correct for bcd year
sched: add sched blocked tracepoint which dumps out context of sleep.
...
Conflicts:
drivers/cpufreq/Kconfig
fs/pstore/ram.c
include/linux/cpufreq.h
include/trace/events/power.h
Diffstat (limited to 'drivers/usb/core/config.c')
0 files changed, 0 insertions, 0 deletions