From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 19:38:42 +0000 (-0700)
Subject: Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'next/cleanup' of git://git./linux/kernel/git/arm/linux-arm-soc

* 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
  ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
  ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
  ARM: S3C24XX: Use generic s3c_set_platdata for devices
  ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
  ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
  ARM: SAMSUNG: Use generic s3c_set_platdata for FB
  ARM: SAMSUNG: Use generic s3c_set_platdata for TS
  ARM: S3C64XX: Add PWM backlight support on SMDK6410
  ARM: S5P64X0: Add PWM backlight support on SMDK6450
  ARM: S5P64X0: Add PWM backlight support on SMDK6440
  ARM: S5PC100: Add PWM backlight support on SMDKC100
  ARM: S5PV210: Add PWM backlight support on SMDKV210
  ARM: EXYNOS4: Add PWM backlight support on SMDKC210
  ARM: EXYNOS4: Add PWM backlight support on SMDKV310
  ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
  clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c
---

ae4c42e4e4d76d003f8ca551fe1aef93ff9a4b21
diff --cc arch/arm/mach-imx/mach-scb9328.c
index 82805260e19c,b77386573502..db2d60470e15
--- a/arch/arm/mach-imx/mach-scb9328.c
+++ b/arch/arm/mach-imx/mach-scb9328.c
@@@ -129,8 -115,9 +115,11 @@@ static struct platform_device *devices[
   */
  static void __init scb9328_init(void)
  {
 +	imx1_soc_init();
 +
+ 	mxc_gpio_setup_multiple_pins(mxc_uart1_pins,
+ 			ARRAY_SIZE(mxc_uart1_pins), "UART1");
+ 
  	imx1_add_imx_uart0(&uart_pdata);
  
  	printk(KERN_INFO"Scb9328: Adding devices\n");
diff --cc arch/arm/mach-omap2/pm.h
index 04ee56646126,babac19e3ec1..4e166add2f35
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@@ -80,17 -68,11 +68,13 @@@ extern u32 enable_off_mode
  
  #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)
  extern void pm_dbg_update_time(struct powerdomain *pwrdm, int prev);
- extern int pm_dbg_regset_save(int reg_set);
- extern int pm_dbg_regset_init(int reg_set);
  #else
  #define pm_dbg_update_time(pwrdm, prev) do {} while (0);
- #define pm_dbg_regset_save(reg_set) do {} while (0);
- #define pm_dbg_regset_init(reg_set) do {} while (0);
  #endif /* CONFIG_PM_DEBUG */
  
 +/* 24xx */
  extern void omap24xx_idle_loop_suspend(void);
 +extern unsigned int omap24xx_idle_loop_suspend_sz;
  
  extern void omap24xx_cpu_suspend(u32 dll_ctrl, void __iomem *sdrc_dlla_ctrl,
  					void __iomem *sdrc_power);