git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Paul Mundt <lethal@linux-sh.org>
	Tue, 8 Dec 2009 06:47:12 +0000 (15:47 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Tue, 8 Dec 2009 06:47:12 +0000 (15:47 +0900)
commit	b005919b17fb86bc279bd152c1850c321506e99b
tree	bd923d78f90addb080abc82f3bff6ca5c9bf10b4	tree \| snapshot
parent	231d345102318e965ba779a6bc12dc53e52feab8	commit \| diff
parent	055f396c0f24ab56b61971ef1784000121e463b2	commit \| diff

Merge branch 'master' into sh/hw-breakpoints

Conflict between FPU thread flag migration and debug
thread flag addition.

Conflicts:
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/ubc.h
arch/sh/kernel/process_32.c

Linux Kernel Source Tree.

RSS Atom

arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/processor_32.h	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/sh/include/asm/ubc.h	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history