author | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 6 Jan 2015 23:43:49 +0000 (17:43 -0600) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Tue, 6 Jan 2015 23:43:49 +0000 (17:43 -0600) | ||
commit | 54bdef9943fdb24d2c8a316c13aa9d7ecd62766e | |
tree | a835f72b8a9d1f616cd036e181878577f74583de | tree | snapshot (tar.xz tar.gz zip) |
parent | f65d6e32fd752a35adfbc1176f3afcebefd2b45f | commit | diff |
parent | 8e9fc4621b1c87a425273404ff95b36bed64946b | commit | diff |
Merge branch 'p-android-3.14' into p-ti-linux-3.14.y-android
p-android-3.14 : forked from google android-3.14 and maintained in omapzoom
p-ti-linux-3.14.y-android : Integration branch of p-ti-linux-3.14.y-common
and p-android-3.14
* p-android-3.14: (351 commits)
xt_qtaguid: Fix boot panic
netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk
net: kuid/kguid build fixes
cpufreq: interactive: hold reference on global cpufreq kobject if needed
futex: Ensure get_futex_key_refs() always implies a barrier
cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
fix sdio.c
video: adf: export the adf_attachment_allow symbol to modules.
power: wakeup_reason: rename irq_count to irqcount
Power: Add guard condition for maximum wakeup reasons
android: base-cfg: enable DM_VERITY (used for secureboot)
drivers: usb: gadget: 64-bit related type fixes
netfilter: xt_qtaguid: 64-bit warning fixes
Staging: android: binder: More offset validation.
POWER: fix compile warnings in log_wakeup_reason
Power: add an API to log wakeup reasons
android: configs: add systrace support to recommended configs
video: adf: use %zu when printing size_t
video: adf: fix compat ioctls calling ioctl with wrong cmd
video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions
...
Conflicts:
drivers/video/Kconfig
net/Makefile
Change-Id: I9a9d8928c23e94456ef650ede4177b74535561c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
p-android-3.14 : forked from google android-3.14 and maintained in omapzoom
p-ti-linux-3.14.y-android : Integration branch of p-ti-linux-3.14.y-common
and p-android-3.14
* p-android-3.14: (351 commits)
xt_qtaguid: Fix boot panic
netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk
net: kuid/kguid build fixes
cpufreq: interactive: hold reference on global cpufreq kobject if needed
futex: Ensure get_futex_key_refs() always implies a barrier
cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
fix sdio.c
video: adf: export the adf_attachment_allow symbol to modules.
power: wakeup_reason: rename irq_count to irqcount
Power: Add guard condition for maximum wakeup reasons
android: base-cfg: enable DM_VERITY (used for secureboot)
drivers: usb: gadget: 64-bit related type fixes
netfilter: xt_qtaguid: 64-bit warning fixes
Staging: android: binder: More offset validation.
POWER: fix compile warnings in log_wakeup_reason
Power: add an API to log wakeup reasons
android: configs: add systrace support to recommended configs
video: adf: use %zu when printing size_t
video: adf: fix compat ioctls calling ioctl with wrong cmd
video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions
...
Conflicts:
drivers/video/Kconfig
net/Makefile
Change-Id: I9a9d8928c23e94456ef650ede4177b74535561c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
66 files changed: