Arnd Bergmann f4e2467bad 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

2012-03-15 15:20:07 +00:00

..

boot

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

2012-03-15 15:20:07 +00:00

common

ARM/PCI: Remove ARM's duplicate definition of 'pcibios_max_latency'

2012-02-21 09:35:32 +00:00

configs

Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

2012-03-08 08:53:14 -08:00

include/asm

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

2012-03-15 15:20:07 +00:00

kernel

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

2012-03-15 15:20:07 +00:00

lib

ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts

2012-01-25 11:07:40 +00:00

mach-at91

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

2012-03-15 15:20:07 +00:00

mach-bcmring

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-clps711x

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-cns3xxx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-davinci

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-dove

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-ebsa110

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-ep93xx

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

2012-03-15 15:20:07 +00:00

mach-exynos

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

2012-03-15 15:20:07 +00:00

mach-footbridge

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-gemini

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-h720x

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-highbank

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-imx

Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup

2012-02-27 13:40:49 +00:00

mach-integrator

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-iop13xx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-iop32x

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-iop33x

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-ixp4xx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-ixp23xx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-ixp2000

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-kirkwood

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-ks8695

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-l7200/include/mach

…

mach-lpc32xx

Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

2012-03-13 16:08:06 -07:00

mach-mmp

Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

2012-03-13 16:08:06 -07:00

mach-msm

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-mv78xx0

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-mxs

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-netx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-nomadik

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-omap1

Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

2012-03-13 16:08:06 -07:00

mach-omap2

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

2012-03-15 15:20:07 +00:00

mach-orion5x

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-picoxcell

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-pnx4008

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-prima2

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-pxa

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

2012-03-15 15:20:07 +00:00

mach-realview

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-rpc

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-s3c24xx

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

2012-03-15 15:20:07 +00:00

mach-s3c64xx

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s3c2410

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s3c2412

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s3c2440

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s5p64x0

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-s5pc100

Merge branch 'next/cleanup-use-static' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

2012-03-07 14:45:28 -08:00

mach-s5pv210

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-sa1100

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-shark

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-shmobile

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-spear3xx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-spear6xx

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-tegra

Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock

2012-03-10 22:21:36 -08:00

mach-u300

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-ux500

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

2012-03-15 15:20:07 +00:00

mach-versatile

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-vexpress

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

2012-03-15 15:20:07 +00:00

mach-vt8500

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-w90x900

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mach-zynq

Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc

2012-02-22 22:04:41 +00:00

mm

ARM: 7345/1: errata: update workaround for A9 erratum #743622

2012-02-27 11:22:08 +00:00

nwfpe

…

oprofile

oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

2011-12-23 11:58:34 +01:00

plat-iop

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-11 18:50:26 -08:00

plat-mxc

Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

2012-02-29 21:18:13 +00:00

plat-nomadik

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2012-01-17 18:40:24 -08:00

plat-omap

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

2012-03-15 15:20:07 +00:00

plat-orion

ARM: orion: Fix USB phy for orion5x.

2012-02-09 16:16:35 -08:00

plat-pxa

…

plat-s3c24xx

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

2012-03-15 15:20:07 +00:00

plat-s5p

ARM: SAMSUNG: use static declaration when it is not used in other files

2012-01-21 13:06:18 +09:00

plat-samsung

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

2012-03-15 15:20:07 +00:00

plat-spear

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

2012-03-15 15:20:07 +00:00

plat-versatile

ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP

2012-01-23 10:20:05 +00:00

tools

ARM: Update mach-types

2011-12-23 22:58:10 +00:00

vfp

…

Kconfig

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

2012-03-15 15:20:07 +00:00

Kconfig-nommu

…

Kconfig.debug

ARM: at91: code removal of CAP9 SoC

2012-02-03 13:33:05 +01:00

Makefile

Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx

2012-03-07 01:36:33 -08:00