From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Sep 2011 21:23:16 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: firefly_0821_release~3680^2~4435
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=38867a28a7dc9d69389990bcd42f6b7c77da3d9d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  mach-integrator: fix VGA base regression
  arm/dt: Tegra: Update SDHCI nodes to match bindings
  ARM: EXYNOS4: fix incorrect pad configuration for keypad row lines
  ARM: SAMSUNG: fix to prevent declaring duplicated
  ARM: SAMSUNG: fix watchdog reset issue with clk_get()
  ARM: S3C64XX: Remove un-used code backlight code on SMDK6410
  ARM: EXYNOS4: restart clocksource while system resumes
  ARM: EXYNOS4: Fix routing timer interrupt to offline CPU
  ARM: EXYNOS4: Fix return type of local_timer_setup()
  ARM: EXYNOS4: Fix wrong pll type for vpll
  ARM: Dove: fix second SPI initialization call
---

38867a28a7dc9d69389990bcd42f6b7c77da3d9d