Mark Brown fa2c8f4017 Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict ...

resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c

2012-02-19 18:35:12 -08:00

..

include/mach

ep93xx: Don't use system controller defines in audio drivers

2012-01-20 13:58:27 +00:00

adssphere.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

clock.c

ARM: 6483/1: arm & sh: factorised duplicated clkdev.c

2010-11-26 10:51:04 +00:00

core.c

ep93xx: Don't use system controller defines in audio drivers

2012-01-20 13:58:27 +00:00

dma.c

ep93xx: add dmaengine platform code

2011-06-08 15:45:52 -06:00

edb93xx.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

gesbc9312.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

Kconfig

ep93xx: add support Vision EP9307 SoM

2011-10-17 11:22:11 +00:00

Makefile

ep93xx: add support Vision EP9307 SoM

2011-10-17 11:22:11 +00:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

micro9.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

simone.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

snappercl15.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

ts72xx.c

Merge branch 'restart' into for-linus

2012-01-05 13:25:27 +00:00

vision_ep9307.c

ep93xx: fix build of vision_ep93xx.c

2012-02-13 06:56:39 +00:00