From: Olof Johansson <olofj@chromium.org>
Date: Wed, 27 Jun 2012 20:13:09 +0000 (-0700)
Subject: Merge branch 'chromeos-exynos-3.4' into chromeos-3.4
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=f08a6071f54b47c6813ff4f6cfb0c08e265a9c4b;p=cascardo%2Flinux.git

Merge branch 'chromeos-exynos-3.4' into chromeos-3.4

* chromeos-exynos-3.4: (390 commits)
  spi: s3c64xx: Add fix for crash in spi suspend/resume
  exynos5: lcd: Free gpio in machine specific set_power callback
  gpu: vithar: To build in non debug mode
  CHROMIUM: spi: Unlock a spinlock before calling into the controller driver.
  lib/scatterlist: do not re-write gfp_flags in __sg_alloc_table
  CHROMIUM: ARM: exynos: handle setaffinity on combined interrupts
  CHROMIUM: ARM: exynos: arm-pmu configuration through dts
  ARM: exynos: add pmu nodes to exynos5250 dts
  ARM: exynos: add cpu nodes to 5250 device tree
  arm: exynos5: dts: add TMU device node
  ARM: exynos5: add tmu clock support
  DRM: exynos: return NULL if exynos_pages_to_sg fails
  media: exynos: fix permissions on files
  drm: vithar: fix permissions on Makefiles
  CHROMIUM: ARM: Exynos5: Manually configure the chip select gpio for spidev.
  CHROMIUM: ASoC: samsung: don't configure smdk audio everywhere
  CHROMIUM: ARM: exynos: add max98095 dt entries
  CHROMIUM: ARM: enable xclkout for audio on daisy/snow
  CHROMIUM: ASoC: samsung: add daisy_max98095.c board
  CHROMIUM: ARM: exynos: Add audio clocks needed for snow(?)
  ...

Conflicts:
	drivers/platform/Makefile

Change-Id: I31ce43ad7b68adb8af91e8d8a747c438b0c9afc1
---

f08a6071f54b47c6813ff4f6cfb0c08e265a9c4b
diff --cc drivers/platform/Makefile
index 189556a7c03f,50e184c26ac8..3d8174e67d67
--- a/drivers/platform/Makefile
+++ b/drivers/platform/Makefile
@@@ -1,6 -1,6 +1,7 @@@
  #
  # Makefile for linux/drivers/platform
  #
 -
 +obj-$(CONFIG_ARM)		+= arm/
  obj-$(CONFIG_X86)		+= x86/
 +obj-$(CONFIG_CHROMEOS)		+= chromeos.o
+ obj-$(CONFIG_MFD_CHROMEOS_EC)	+= chromeos_ec-fw.o
diff --cc mm/page_alloc.c
index d7780d959049,ed85c02c1f6e..4ac1aa10722b
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -57,8 -57,8 +57,9 @@@
  #include <linux/ftrace_event.h>
  #include <linux/memcontrol.h>
  #include <linux/prefetch.h>
+ #include <linux/migrate.h>
  #include <linux/page-debug-flags.h>
 +#include <linux/low-mem-notify.h>
  
  #include <asm/tlbflush.h>
  #include <asm/div64.h>