From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2012 15:19:05 +0000 (+0000)
Subject: Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f4e2467bad53023589cbff18dd1ab6e0aa3f004c;p=linux-beck.git

Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup

* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6:
  ep93xx: Remove unnecessary includes of ep93xx-regs.h
  ep93xx: Move EP93XX_SYSCON defines to SoC private header
  ep93xx: Move crunch code to mach-ep93xx directory
  ep93xx: Make syscon access functions private to SoC
  ep93xx: Configure GPIO ports in core code
  ep93xx: Move peripheral defines to local SoC header
  ep93xx: Convert the watchdog driver into a platform device.
  ep93xx: Use ioremap for backlight driver
  ep93xx: Move GPIO defines to gpio-ep93xx.h
  ep93xx: Don't use system controller defines in audio drivers
  ep93xx: Move PHYS_BASE defines to local SoC header file

(update to v3.3-rc7)

Conflicts:
	arch/arm/mach-s3c2440/common.h
---

f4e2467bad53023589cbff18dd1ab6e0aa3f004c