Merge tag 'disintegrate-m68k-20121009' of git://git.infradead.org/users/dhowells...

author Geert Uytterhoeven <[email protected]>

Mon, 15 Oct 2012 21:03:30 +0000 (23:03 +0200)

committer Geert Uytterhoeven <[email protected]>

Mon, 15 Oct 2012 21:03:30 +0000 (23:03 +0200)
author Geert Uytterhoeven <[email protected]>
Mon, 15 Oct 2012 21:03:30 +0000 (23:03 +0200)
committer Geert Uytterhoeven <[email protected]>
Mon, 15 Oct 2012 21:03:30 +0000 (23:03 +0200)
diff --cc arch/m68k/include/asm/Kbuild
Simple merge
diff --cc arch/m68k/include/asm/ptrace.h
Simple merge
diff --cc arch/m68k/include/asm/unistd.h
Simple merge
author	Geert Uytterhoeven <[email protected]>
	Mon, 15 Oct 2012 21:03:30 +0000 (23:03 +0200)
committer	Geert Uytterhoeven <[email protected]>
	Mon, 15 Oct 2012 21:03:30 +0000 (23:03 +0200)
		1	2
arch/m68k/include/asm/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history
arch/m68k/include/asm/ptrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/m68k/include/asm/unistd.h	patch \|	diff1 \|	diff2 \|	blob \| history