Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:13:19 +0000 (18:13 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 6 Aug 2010 17:13:19 +0000 (18:13 +0100)
commit500b9fc922cbec572f4fd1436533bfaed5011262
treeaac4b7de0871e66740aeaf3510f7a59280026592
parentf165eb77f49cb6f6e86e2f2f09183904b2965d19
parentbeccb12f6fbcc73339f127ff1f00638f076c933f
Merge /linux/kernel/git/lethal/genesis-2.6 into devel-stable

Conflicts:
drivers/net/irda/sh_irda.c
MAINTAINERS
arch/sh/boards/mach-ap325rxa/setup.c
drivers/net/irda/sh_irda.c
drivers/video/Kconfig
drivers/video/Makefile