Mike Frysinger 51946b10cf Blackfin: bf533: merge fio_flag back into normal mach headers ...

We don't want the BF533 to be different in terms of its MMR headers, so
merge the FIO_FLAG helpers back into the normal place.  To avoid circular
dependencies with headers, turn the inline C funcs into CPP defines.  Not
like there will be any code size differences.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2011-01-10 07:18:08 -05:00

..

alpha

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-01-07 14:39:20 -08:00

arm

Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

2011-01-07 17:08:46 -08:00

avr32

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

2010-10-28 16:16:39 -07:00

blackfin

Blackfin: bf533: merge fio_flag back into normal mach headers

2011-01-10 07:18:08 -05:00

cris

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

2010-10-28 16:16:39 -07:00

frv

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

h8300

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

ia64

fs: scale mntget/mntput

2011-01-07 17:50:33 +11:00

m32r

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

2010-10-28 16:16:39 -07:00

m68k

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

m68knommu

BKL: remove extraneous #include <smp_lock.h>

2010-11-17 08:59:32 -08:00

microblaze

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

2010-10-28 16:16:39 -07:00

mips

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-01-07 14:39:20 -08:00

mn10300

arch/mn10300/kernel/irq.c: fix build

2011-01-03 16:36:33 -08:00

parisc

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-01-07 14:39:20 -08:00

powerpc

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-01-07 14:39:20 -08:00

s390

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

2011-01-07 14:50:50 -08:00

score

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

2010-10-28 16:16:39 -07:00

sh

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

2011-01-07 16:58:04 -08:00

sparc

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-01-07 14:39:20 -08:00

tile

arch/tile: handle rt_sigreturn() more cleanly

2010-12-17 16:59:29 -05:00

um

uml: disable winch irq before freeing handler data

2010-11-25 06:50:39 +09:00

x86

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2011-01-07 17:02:58 -08:00

xtensa

TTY: Add tty ioctl to figure device node of the system console.

2010-12-16 16:18:28 -08:00

.gitignore

…

Kconfig

[S390] mutex: Introduce arch_mutex_cpu_relax()

2011-01-05 12:47:31 +01:00