Tony Lindgren ad19d8d90c [ARM] 5436/1: ARM: OMAP: Fix compile for rx51 ... This fixes a compile error caused by a mismerge while rebasing the patch: linux-2.6/arch/arm/mach-omap2/board-rx51-peripherals.c:354: undefined reference to `twl4030_mmc_init' Looks like I need to also update my build scripts, just grepping for error: in the logs is not obviously enough.. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2009-04-01 22:14:51 +01:00
..
alpha	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
arm	[ARM] 5436/1: ARM: OMAP: Fix compile for rx51	2009-04-01 22:14:51 +01:00
avr32	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6	2009-03-28 13:55:49 -07:00
cris	Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:06:50 -07:00
frv
h8300	Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:11:41 -07:00
ia64	Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-28 13:48:38 -07:00
m32r
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-03-26 16:15:31 -07:00
m68knommu	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-03-26 15:23:24 -07:00
mips	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
mn10300	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
parisc	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
powerpc	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-03-27 16:23:12 -07:00
sh	i2c-algo-pca: Rework waiting for a free bus	2009-03-28 21:34:45 +01:00
sparc	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
um	uml: convert network device to netdevice ops	2009-03-27 00:46:40 -07:00
x86	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
xtensa	Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:11:41 -07:00
.gitignore
Kconfig