Mark Brown a9e3de6f9f Merge branch 'tegra' into for-2.6.40 ...

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig

2011-04-21 12:00:27 +01:00

..

alpha

…

arm

Merge branch 'tegra' into for-2.6.40

2011-04-21 12:00:27 +01:00

avr32

…

blackfin

…

cris

…

frv

…

h8300

…

ia64

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

m32r

…

m68k

…

microblaze

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

mips

…

mn10300

…

parisc

…

powerpc

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

s390

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

2011-04-08 07:36:14 -07:00

score

…

sh

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

2011-04-07 12:49:17 -07:00

sparc

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

tile

…

um

…

unicore32

Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

2011-04-07 11:14:49 -07:00

x86

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

2011-04-07 12:12:58 -07:00

xtensa

…

.gitignore

…

Kconfig

…