Sascha Hauer 415d34195b ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED ...

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

2010-11-15 09:25:02 +01:00

..

alpha

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

arm

ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED

2010-11-15 09:25:02 +01: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

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb

2010-10-29 11:49:38 -07: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

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

h8300

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

ia64

convert get_sb_pseudo() users

2010-10-29 04:16:33 -04: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

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

m68knommu

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

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 git://git.infradead.org/mtd-2.6

2010-10-30 08:31:35 -07:00

mn10300

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

parisc

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

powerpc

Merge git://git.infradead.org/mtd-2.6

2010-10-30 08:31:35 -07:00

s390

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

2010-10-29 08:49:18 -07: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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-10-30 08:26:25 -07:00

sparc

Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-10-30 11:43:26 -07:00

tile

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

um

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

x86

Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-10-30 11:43:26 -07:00

xtensa

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

.gitignore

…

Kconfig

jump label: Add work around to i386 gcc asm goto bug

2010-10-29 14:45:29 -04:00