Merge branch 'master' into sh/smp

Conflicts:
	arch/sh/mm/cache-sh4.c
This commit is contained in:
Paul Mundt
2009-09-01 13:54:14 +09:00
414 changed files with 15153 additions and 2589 deletions

View File

@@ -11,7 +11,7 @@
ENTRY(__clear_user)
!
mov #0, r0
mov #0xe0, r1 ! 0xffffffe0
mov #0xffffffe0, r1
!
! r4..(r4+31)&~32 -------- not aligned [ Area 0 ]
! (r4+31)&~32..(r4+r5)&~32 -------- aligned [ Area 1 ]