Mark Brown f455dfb106 ASoC: Fix up merge with the ARM tree ...

The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2009-03-10 19:51:07 +00:00

..

boot

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

2008-12-02 22:07:40 +00:00

common

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

configs

[ARM] remove missed CLPS7500 defconfig

2009-01-08 16:29:43 +00:00

include/asm

NOMMU: Make VMAs per MM as for MMU-mode linux

2009-01-08 12:04:47 +00:00

kernel

[ARM] arch/arm/kernel/isa.c: missing definition of register_isa_ports

2009-01-08 15:53:08 +00:00

lib

Merge branch 'clps7500' into devel

2008-11-27 12:39:43 +00:00

mach-aaec2000

arm: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-06 10:44:43 -08:00

mach-at91

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-clps711x

[ARM] clps711x: fix warning in edb7211-mm.c

2009-01-08 16:29:42 +00:00

mach-davinci

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-ebsa110

[ARM] Hide ISA DMA API when ISA_DMA_API is unset

2008-11-29 18:42:40 +00:00

mach-ep93xx

arm: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-06 10:44:43 -08:00

mach-footbridge

Merge branch 'devel'

2009-01-08 22:01:49 +00:00

mach-h720x

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-imx

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

mach-integrator

PCI: arm: use generic pci_swizzle_interrupt_pin()

2009-01-07 11:12:51 -08:00

mach-iop13xx

[ARM] Hide ISA DMA API when ISA_DMA_API is unset

2008-11-29 18:42:40 +00:00

mach-iop32x

[ARM] Hide ISA DMA API when ISA_DMA_API is unset

2008-11-29 18:42:40 +00:00

mach-iop33x

[ARM] fix missing includes for iop33x and sa1100_ir

2008-12-01 23:01:19 +00:00

mach-ixp4xx

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

mach-ixp23xx

[ARM] Hide ISA DMA API when ISA_DMA_API is unset

2008-11-29 18:42:40 +00:00

mach-ixp2000

[ARM] Hide ISA DMA API when ISA_DMA_API is unset

2008-11-29 18:42:40 +00:00

mach-kirkwood

[ARM] 5357/1: Kirkwood: add missing ge01 tclk initialization

2009-01-08 16:29:41 +00:00

mach-ks8695

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-l7200

[ARM] Add a common typesafe __io implementation

2008-11-30 11:45:54 +00:00

mach-lh7a40x

arm: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-06 10:44:43 -08:00

mach-loki

[ARM] Hide ISA DMA API when ISA_DMA_API is unset

2008-11-29 18:42:40 +00:00

mach-msm

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-mv78xx0

[ARM] 5361/1: mv78xx0: fix compilation error

2009-01-08 16:29:40 +00:00

mach-mx1

[ARM] MXC: remove dependency to other include files from irqs.h

2008-12-18 16:40:11 +01:00

mach-mx2

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-mx3

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-netx

[ARM] fix netx

2009-01-08 16:29:44 +00:00

mach-ns9xxx

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

mach-omap1

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-omap2

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-orion5x

[ARM] 5360/1: Orion: fix compilation error

2009-01-08 16:29:40 +00:00

mach-pnx4008

[ARM] fix pnx4008

2009-01-08 16:29:43 +00:00

mach-pxa

ASoC: add two more bitfields for PXA SSP

2009-03-06 13:37:13 +00:00

mach-realview

[ARM] Fix realview build

2009-01-08 16:29:41 +00:00

mach-rpc

[ARM] give RiscPC a NR_IRQS definition and remove default

2008-11-29 19:14:31 +00:00

mach-s3c24a0/include/mach

[ARM] S3C24A0: Remove duplicate <mach/io.h> file

2008-12-18 16:35:59 +00:00

mach-s3c2400

[ARM] remove a common set of __virt_to_bus definitions

2008-11-28 15:36:49 +00:00

mach-s3c2410

S3C: Move <mach/audio.h> to <plat/audio.h>

2009-03-05 12:01:00 +00:00

mach-s3c2412

S3C24XX: Move and update IIS headers

2009-03-05 12:00:59 +00:00

mach-s3c2440

S3C24XX: Move and update IIS headers

2009-03-05 12:00:59 +00:00

mach-s3c2442

[ARM] Arrange for platforms to select appropriate CPU support

2008-11-27 12:38:00 +00:00

mach-s3c2443

S3C24XX: Move and update IIS headers

2009-03-05 12:00:59 +00:00

mach-s3c6400

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

mach-s3c6410

Merge branch 'next-s3c64xx-device' into next-merged

2008-12-18 16:17:37 +00:00

mach-sa1100

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

mach-shark

ASoC: Fix up merge with the ARM tree

2009-03-10 19:51:07 +00:00

mach-versatile

arm: struct device - replace bus_id with dev_name(), dev_set_name()

2009-01-06 10:44:43 -08:00

mach-w90x900

[ARM] 5338/1: Add Nuvoton W90P910 Platform support

2008-12-03 21:57:16 +00:00

mm

NOMMU: Rename ARM's struct vm_region

2009-01-08 12:04:47 +00:00

nwfpe

[ARM] Convert asm/uaccess.h to linux/uaccess.h

2008-09-06 11:35:55 +01:00

oprofile

cpumask: make irq_set_affinity() take a const struct cpumask

2008-12-13 21:20:26 +10:30

plat-iop

[ARM] iop: iop3xx needs registers mapped uncached+unbuffered

2008-11-09 11:18:36 +00:00

plat-mxc

USB: add imx udc gadget driver

2009-01-07 10:00:11 -08:00

plat-omap

[ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, pxa, s3c

2009-01-08 16:29:42 +00:00

plat-orion

Merge branch 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-01-02 11:44:09 -08:00

plat-s3c

ASoC: Fix Samsung S3C2412_IISMOD_SDF_{MSB,LSB} definitions

2009-03-09 18:28:17 +00:00

plat-s3c24xx

S3C24XX: Move and update IIS headers

2009-03-05 12:00:59 +00:00

plat-s3c64xx

[ARM] S3C64XX: Fix EINT group macro definition

2009-01-08 16:25:24 +00:00

tools

[ARM] Update mach-types

2008-11-30 16:39:42 +00:00

vfp

[ARM] 5349/1: VFP: Add PM code to save and restore current VFP state

2008-12-18 21:21:34 +00:00

Kconfig

Staging: Kconfig for ARCH=arm,8300, cris

2009-01-06 13:51:38 -08:00

Kconfig-nommu

[ARM] 4532/1: allow configuration of processor ID

2007-10-12 23:43:02 +01:00

Kconfig.debug

[ARM] CONFIG_DEBUG_STACK_USAGE

2008-01-26 14:50:06 +00:00

Makefile

Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel

2008-12-18 22:15:30 +00:00