pilppa.com Git - linux-2.6-omap-h63xx.git/commit

[PATCH] uml: fix patch mismerge

I sent a patch, it was applied as cda402b283c34a24b091f78eee116963e9494762,
then it was applied again as 181ae4005d0a4010802be534d929b38c42b9ac06 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>

author	Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
	Mon, 1 May 2006 19:16:01 +0000 (12:16 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Tue, 2 May 2006 01:17:44 +0000 (18:17 -0700)
commit	b15fb6b157b83ce983e42130ab7d1a866020d8f5
tree	6a90f7c7162270c8858d4555115469cd78bbf4ae	tree \| snapshot
parent	2ace87b9502d922397cabaf07d73e0b60c480ecf	commit \| diff