Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 005c79b3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

parents 4d7902f2 eda58a85

Documentation/filesystems/ubifs.txt

+0 −7
Original line number Diff line number Diff line
@@ -79,13 +79,6 @@ Mount options 


(*) == default.



norm_unmount (*)	commit on unmount; the journal is committed

			when the file-system is unmounted so that the

			next mount does not have to replay the journal

			and it becomes very fast;

fast_unmount		do not commit on unmount; this option makes

			unmount faster, but the next mount slower

			because of the need to replay the journal.

bulk_read		read more in one go to take advantage of flash

			media that read faster sequentially

no_bulk_read (*)	do not bulk-read

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ S: Maintained 
BLACKFIN ARCHITECTURE

P:	Bryan Wu

M:	cooloney@kernel.org

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

arch/arm/kernel/entry-armv.S

+1 −0
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ ENTRY(fp_enter) 
no_fp:	mov	pc, lr



__und_usr_unknown:

	enable_irq

	mov	r0, sp

	adr	lr, ret_from_exception

	b	do_undefinstr

arch/arm/kernel/entry-common.S

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ ENTRY(mcount) 
	ldmia sp!, {r0-r3, pc}



trace:

	ldr r1, [fp, #-4]

	ldr r1, [fp, #-4]			@ lr of instrumented routine

	mov r0, lr

	sub r0, r0, #MCOUNT_INSN_SIZE

	mov lr, pc

arch/arm/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ unlock: 
/* Handle bad interrupts */

static struct irq_desc bad_irq_desc = {

	.handle_irq = handle_bad_irq,

	.lock = SPIN_LOCK_UNLOCKED

	.lock = __SPIN_LOCK_UNLOCKED(bad_irq_desc.lock),

};



/*