Merge branches 'arm-mm', 'at91', 'clkevts', 'imx', 'iop', 'misc', 'netx', 'ns9xxx...

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Sun, 6 May 2007 19:57:51 +0000 (20:57 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Sun, 6 May 2007 19:57:51 +0000 (20:57 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 6 May 2007 19:57:51 +0000 (20:57 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 May 2007 19:57:51 +0000 (20:57 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-iop13xx/pci.c
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Sun, 6 May 2007 19:57:51 +0000 (20:57 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Sun, 6 May 2007 19:57:51 +0000 (20:57 +0100)
		1	2	3	4	5	6	7	8	9	10	11	12	13
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	diff11 \|	diff12 \|	diff13 \|	blob \| history
arch/arm/mach-iop13xx/pci.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	diff10 \|	diff11 \|	diff12 \|	diff13 \|	blob \| history