Russell King 500b9fc922 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable ... Conflicts: drivers/net/irda/sh_irda.c		2010-08-06 18:13:19 +01:00
..
Makefile	…
sdram.S	…
setup.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-08-06 18:13:19 +01:00