git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3b0eb4a 3668b45)

author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Tue, 20 Feb 2007 10:52:01 +0000 (10:52 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 20 Feb 2007 10:52:43 +0000 (10:52 +0000)
commit	e80a0e6e7ccdf64575d4384cb4172860422f5b81
tree	8960fa71eb73d0f1185e893192411cb873362738	tree
parent	3b0eb4a195a124567cd0dd6f700f8388def542c6	commit \| diff
parent	3668b45d46f777b0773ef5ff49531c1144efb6dd	commit \| diff

[ARM] Merge remaining IOP code

Conflicts:
include/asm-arm/arch-at91rm9200/entry-macro.S

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-iop32x/n2100.c	diff1 \|	diff2 \|	blob \| history
include/asm-arm/arch-at91/entry-macro.S	diff1 \|	\|	blob \| history
include/asm-arm/arch-imx/entry-macro.S	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.