Paolo 'Blaisorblade' Giarrusso b15fb6b157 [PATCH] uml: fix patch mismerge ... I sent a patch, it was applied as cda402b283, then it was applied again as 181ae4005d by mistake. But while the 1st time it modified (correctly) cow_header_v3, the 2nd it modified cow_header_v3_broken. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-05-01 18:17:44 -07:00
..
alpha	[PATCH] Alpha: strncpy() fix	2006-04-25 07:51:06 -07:00
arm	Merge nommu tree	2006-04-26 21:18:45 +01:00
arm26
cris
frv
h8300
i386	[PATCH] i386: Remove apic= warning	2006-05-01 18:17:43 -07:00
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2006-04-27 17:01:37 -07:00
m32r	[PATCH] m32r: update switch_to macro for tuning	2006-04-19 09:13:51 -07:00
m68k
m68knommu
mips	[MIPS] Fix branch emulation for floating-point exceptions.	2006-04-27 15:13:50 +01:00
parisc	[PARISC] Add new entries to the syscall table	2006-04-21 22:20:35 +00:00
powerpc	[PATCH] powerpc: update cell_defconfig	2006-04-29 15:11:30 +10:00
ppc	[PATCH] ppc32: Update board-specific code of the CPM UART users	2006-04-28 21:11:30 +10:00
s390	[PATCH] s390: new system calls	2006-04-28 08:33:48 -07:00
sh
sh64
sparc
sparc64	[SPARC64]: Disable preemption during flush_tlb_pending().	2006-04-30 22:54:27 -07:00
um	[PATCH] uml: fix patch mismerge	2006-05-01 18:17:44 -07:00
v850
x86_64	[PATCH] x86_64: Add compat_sys_vmsplice and use it in x86-64	2006-05-01 18:17:43 -07:00
xtensa