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

..

alpha

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

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

arm

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

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

avr32

avr32: select generic atomic64_t support

2012-02-03 16:16:40 -08:00

blackfin

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

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

c6x

…

cris

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2012-01-10 18:04:27 -08:00

frv

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

h8300

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

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

hexagon

…

ia64

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-01-18 15:51:48 -08:00

m32r

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

m68k

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

2012-01-26 12:43:57 -08:00

microblaze

Revert "microblaze: Add topology init"

2012-01-31 09:06:52 +01:00

mips

Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are

2012-02-09 12:00:22 +00:00

mn10300

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

openrisc

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

2012-01-16 14:34:54 -08:00

parisc

parisc, exec: remove redundant set_fs(USER_DS)

2012-01-12 20:13:04 -08:00

powerpc

powerpc/perf: power_pmu_start restores incorrect values, breaking frequency events

2012-02-16 16:24:35 +11:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-01-30 09:02:10 -08:00

score

score: fix off-by-one index into syscall table

2012-01-23 08:38:49 -08:00

sh

Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are

2012-02-09 12:00:22 +00:00

sparc

lib: Fix multiple definitions of clz_tab

2012-02-02 10:34:23 +11:00

tile

Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

2012-01-14 18:03:30 -08:00

um

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit

2012-01-17 16:41:31 -08:00

unicore32

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

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

x86

i387: re-introduce FPU state preloading at context switch time

2012-02-18 14:03:48 -08:00

xtensa

xtensa: fix memscan()

2012-02-03 16:16:40 -08:00

.gitignore

…

Kconfig

mm,x86,um: move CMPXCHG_DOUBLE config option

2012-01-12 20:13:03 -08:00