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

..

alpha

PCI: alpha: use generic INTx swizzle from PCI core

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

arm

ASoC: Fix up merge with the ARM tree

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

avr32

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

2009-01-09 11:52:14 -08:00

blackfin

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

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

cris

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

2009-01-07 11:31:52 -08:00

frv

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

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

h8300

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

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

ia64

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

2009-01-10 06:12:18 -08:00

m32r

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

2009-01-03 12:04:39 -08:00

m68k

m68k: Fix --build-id breakage for sun3

2009-01-12 20:56:44 +01:00

m68knommu

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

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

mips

MIPS: Only write c0_framemask on CPUs which have this register.

2009-01-11 09:57:28 +00:00

mn10300

take init_fs to saner place

2008-12-31 18:07:42 -05:00

parisc

parisc: introduce asm/swab.h

2009-01-09 12:46:23 -08:00

powerpc

[WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610

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

s390

[S390] Use unsigned long long for u64 on 64bit.

2009-01-09 12:15:07 +01:00

sh

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

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

sparc

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

2009-01-12 16:28:26 -08:00

um

mm: invoke oom-killer from page fault

2009-01-06 15:58:58 -08:00

x86

Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write"

2009-01-12 19:24:23 +01:00

xtensa

xtensa: introduce swab.h

2009-01-07 12:22:04 -08:00

.gitignore

…

Kconfig

oprofile: select RING_BUFFER

2008-12-12 09:46:31 +01:00