[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <86802c440810010753u5f160e22m58c8b949277eea98@mail.gmail.com>
Date: Wed, 1 Oct 2008 07:53:23 -0700
From: "Yinghai Lu" <yinghai@...nel.org>
To: "Ingo Molnar" <mingo@...e.hu>
Cc: "Alexander van Heukelum" <heukelum@...lshack.com>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] fix: x86: remove cpu_vendor_dev
On Wed, Oct 1, 2008 at 12:36 AM, Ingo Molnar <mingo@...e.hu> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists