Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4

* common/android-3.4:
  gpu: ion: Also shrink memory cached in the deferred free list
  net: wireless: bcmdhd: Update to version 1.88.21
  misc: uidstat: avoid create_stat() race and blockage.
  net: wireless: bcmdhd: Close p2p0 device in wl_down
  mmc: Add tracepoints of mmc block operations
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4

* android-exynos-3.4:
  gpu: ion: Also shrink memory cached in the deferred free list
  net: wireless: bcmdhd: Update to version 1.88.21
  misc: uidstat: avoid create_stat() race and blockage.
  net: wireless: bcmdhd: Close p2p0 device in wl_down
  mmc: Add tracepoints of mmc block operations
ARM: exynos: manta: enable KSM

Change-Id: Id2469fdc8aebbbb4706c91abe4532067e2dd86a7
Signed-off-by: Rom Lemarchand <romlem@google.com>
Merge branch 'android-3.4' into android-exynos-3.4

* android-3.4:
  android: configs: no MODULES for base, no SIP for recommended
  android: configs: Reorder config fragments
  ashmem: avoid deadlock between read and mmap calls
  android: configs: Enable KSM support by default
  android: configs: Add Logitech unifying receivers to recommended
Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4

* exynos/android-exynos-3.4:
  android: configs: no MODULES for base, no SIP for recommended
  android: configs: Reorder config fragments
  ashmem: avoid deadlock between read and mmap calls
  android: configs: Enable KSM support by default
  android: configs: Add Logitech unifying receivers to recommended
Merge branch 'android-3.4' into android-exynos-3.4
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4

Conflicts:
	include/linux/alarmtimer.h
	kernel/time/alarmtimer.c

Change-Id: I404973579022e66dea41efe749cd90de59b7c774
Merge branch 'android-3.4' into android-exynos-3.4
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4

* common/android-3.4:
  ping: always initialize ->sin6_scope_id and ->sin6_flowinfo
  net: ipv6: Add IPv6 support to the ping socket.
  ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions
  cpufreq: interactive: resched timer if max freq raised
  cpufreq: interactive: fix race on cpufreq TRANSITION notifier
Merge remote-tracking branch 'origin/android-exynos-manta-3.4-jbmr2' into android-exynos-manta-3.4

* origin/android-exynos-manta-3.4-jbmr2:
  ashmem: avoid deadlock between read and mmap calls
  ARM: exynos: manta: disable modules support
  gpu: ion: Also shrink memory cached in the deferred free list
Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4

* exynos/android-exynos-3.4:
  ping: always initialize ->sin6_scope_id and ->sin6_flowinfo
  net: ipv6: Add IPv6 support to the ping socket.
  ipv6: introdcue __ipv6_addr_needs_scope_id and ipv6_iface_scope_id helper functions
  cpufreq: interactive: resched timer if max freq raised
  cpufreq: interactive: fix race on cpufreq TRANSITION notifier
mali: ARM Mali driver kernel trunk sync [revision 87421 (Gherkin)]

Bug: 8581535, 8618548, 8857565, 8797701, 7228897

Change-Id: Ic41e2744b6789c0d3cb16ba2e9cc7ad474c49cff
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
Merge branch 'android-3.4' into android-exynos-3.4
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
Merge remote-tracking branch 'common/android-3.4' into HEAD
exynos: ion: Use the updated definition of ion_platform_data

Change-Id: Iffdb135e84307b3f41dbd25f384413bfaaff6788
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4
Merge branch 'android-3.4' into android-exynos-3.4