Merge branch 'ptebits' into devel

Conflicts:

	arch/arm/Kconfig
This commit is contained in:
Russell King
2008-10-09 21:31:56 +01:00
committed by Russell King
627 changed files with 28337 additions and 6032 deletions

View File

@@ -29,7 +29,7 @@ ENTRY(sha_transform)
stmfd sp!, {r4 - r8, lr}
@ for (i = 0; i < 16; i++)
@ W[i] = be32_to_cpu(in[i]); */
@ W[i] = be32_to_cpu(in[i]);
#ifdef __ARMEB__
mov r4, r0