From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 03:16:43 +0000 (-0700)
Subject: Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: accepted/tizen/common/20141203.182822~6004
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25498e5b3df931a3d52a6e0642ae242e4ee19488;p=platform%2Fkernel%2Flinux-arm64.git

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

* 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
  hw_random: add driver for atmel true hardware random number generator
  ARM: at91: at91sam9g45: add trng clock and platform device
  MX53 Enable the AHCI SATA on MX53 SMD board
  MX53 Enable the AHCI SATA on MX53 LOCO board
  MX53 Enable the AHCI SATA on MX53 ARD board
  AHCI Add the AHCI SATA feature on the MX53 platforms
  Fix pata imx resource
  ARM: imx: Define functions for registering PATA
  ARM: imx: Add PATA clock support
  ARM: imx: Add PATA resources for other i.MX processors
  imx: efika: Enable pata.
  imx51: add pata clock
  imx51: add pata device

Fix up trivial conflict (new selects next to each other from separate
branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
---

25498e5b3df931a3d52a6e0642ae242e4ee19488
diff --cc arch/arm/mach-mx5/Kconfig
index b4f5ab6,28b94e0..5e42c73
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@@ -152,7 -147,7 +152,8 @@@ config MX51_EFIKA_COMMO
  	bool
  	select SOC_IMX51
  	select IMX_HAVE_PLATFORM_IMX_UART
 +	select IMX_HAVE_PLATFORM_MXC_EHCI
+ 	select IMX_HAVE_PLATFORM_PATA_IMX
  	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
  	select IMX_HAVE_PLATFORM_SPI_IMX
  	select MXC_ULPI if USB_ULPI