Re: [PATCH] fix: x86: remove cpu_vendor_dev

[Yinghai Lu]

On Wed, Oct 1, 2008 at 12:36 AM, Ingo Molnar <mingo@xxxxxxx> wrote:
>
>> there is two copy of SECURITY_INIT
>
> indeed. I fixed this up now.
>
> interestingly, this seems to be one of the rare cases where Git
> auto-merge does the wrong thing - tt should have detected a conflict.
>

should let git guys know that.

YH
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/